summaryrefslogtreecommitdiff
path: root/data/maps/ShoalCave_LowTideInnerRoom
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/ShoalCave_LowTideInnerRoom')
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/scripts.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 37b7beb04..17f6a7ca6 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -63,8 +63,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1::
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
giveitem ITEM_SHOAL_SHELL
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_1
@@ -80,8 +79,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2::
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
giveitem ITEM_SHOAL_SHELL
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_2
@@ -92,8 +90,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3::
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
giveitem ITEM_SHOAL_SHELL
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_3
@@ -104,8 +101,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4::
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
giveitem ITEM_SHOAL_SHELL
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SHELL_4
@@ -116,8 +112,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1::
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
giveitem ITEM_SHOAL_SALT
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_1
@@ -133,8 +128,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2::
lockall
goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
giveitem ITEM_SHOAL_SALT
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, FALSE
special DrawWholeMapView
setflag FLAG_RECEIVED_SHOAL_SALT_2