summaryrefslogtreecommitdiff
path: root/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/ShoalCave_LowTideInnerRoom/scripts.inc')
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/scripts.inc32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 512de471c..e98e8d107 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -1,6 +1,6 @@
ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192
- map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3
- map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_15E19D
+ map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3
+ map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_15E19D
.byte 0
ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D
@@ -62,9 +62,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256
ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
lockall
goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289
- giveitem_std ITEM_SHOAL_SHELL
+ giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
- goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
@@ -72,16 +72,16 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
end
ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289
- msgbox ShoalCave_LowTideInnerRoom_Text_1C69B8, 4
+ msgbox ShoalCave_LowTideInnerRoom_Text_1C69B8, MSGBOX_DEFAULT
releaseall
end
ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
lockall
goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289
- giveitem_std ITEM_SHOAL_SHELL
+ giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
- goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
@@ -91,9 +91,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
lockall
goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289
- giveitem_std ITEM_SHOAL_SHELL
+ giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
- goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
@@ -103,9 +103,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
lockall
goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289
- giveitem_std ITEM_SHOAL_SHELL
+ giveitem ITEM_SHOAL_SHELL
compare VAR_RESULT, 0
- goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
special DrawWholeMapView
setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
@@ -115,9 +115,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
lockall
goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B
- giveitem_std ITEM_SHOAL_SALT
+ giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, 0
- goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
special DrawWholeMapView
setflag FLAG_HIDE_TOOK_SHOAL_SALT_1
@@ -125,16 +125,16 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
end
ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B
- msgbox ShoalCave_LowTideInnerRoom_Text_1C6979, 4
+ msgbox ShoalCave_LowTideInnerRoom_Text_1C6979, MSGBOX_DEFAULT
releaseall
end
ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365
lockall
goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B
- giveitem_std ITEM_SHOAL_SALT
+ giveitem ITEM_SHOAL_SALT
compare VAR_RESULT, 0
- goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
special DrawWholeMapView
setflag FLAG_HIDE_TOOK_SHOAL_SALT_2