diff options
Diffstat (limited to 'data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc')
| -rw-r--r-- | data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 76de79e6f..025c33550 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D @@ -18,7 +18,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer - dodailyevents + dotimebasedevents call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare VAR_RESULT, 0 @@ -34,13 +34,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106 compare VAR_RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E - msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 - takeitem ITEM_SHOAL_SALT, 4 - takeitem ITEM_SHOAL_SHELL, 4 - giveitem_std ITEM_SHELL_BELL + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, MSGBOX_DEFAULT + removeitem ITEM_SHOAL_SALT, 4 + removeitem ITEM_SHOAL_SHELL, 4 + giveitem ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B - msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 + goto_if_eq Common_EventScript_ShowBagIsFull + msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end @@ -62,7 +62,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E128:: @ 815E128 return ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E - msgbox ShoalCave_LowTideEntranceRoom_Text_1C69F5, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C69F5, MSGBOX_DEFAULT release end @@ -73,17 +73,17 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SHELL, 1 compare VAR_RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 - msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_15E162:: @ 815E162 - msgbox ShoalCave_LowTideEntranceRoom_Text_1C670D, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C670D, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C - msgbox ShoalCave_LowTideEntranceRoom_Text_1C6944, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6944, MSGBOX_DEFAULT release end |