summaryrefslogtreecommitdiff
path: root/data/maps/FourIsland_LoreleisHouse/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FourIsland_LoreleisHouse/scripts.inc')
-rw-r--r--data/maps/FourIsland_LoreleisHouse/scripts.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc
index 6a8915d83..c39cc1da9 100644
--- a/data/maps/FourIsland_LoreleisHouse/scripts.inc
+++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc
@@ -1,18 +1,16 @@
FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E
- map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54
+ map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_LoreleisHouse_OnTransition
.byte 0
-FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54
+FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
special Special_ComputeLoreleiDollCollection
end
FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
lock
faceplayer
- checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
- goto_if TRUE, EventScript_171C83
- checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE
- goto_if TRUE, EventScript_171C76
+ goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83
+ goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76
msgbox gUnknown_81A3826
release
end