diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/scripts/maps/IslandCave.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/IslandCave.inc')
| -rw-r--r-- | data/scripts/maps/IslandCave.inc | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b16f386d8..d8576e883 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,52 +5,49 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag 2145 - callif 1, IslandCave_EventScript_15EED0 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0 end IslandCave_EventScript_15EED0:: @ 815EED0 - disappear LAST_TALKED + removeobject LAST_TALKED return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag 2129 - callif 0, IslandCave_EventScript_15EEDE + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return IslandCave_MapScript1_15EF15:: @ 815EF15 - setflag 2133 + setflag FLAG_LANDMARK_ISLAND_CAVE end -gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19 - setmaptile 7, 19, 554, 1 - setmaptile 8, 19, 555, 1 - setmaptile 9, 19, 556, 1 - setmaptile 7, 20, 562, 1 - setmaptile 8, 20, 563, 0 - setmaptile 9, 20, 564, 1 +S_OpenRegiceChamber:: @ 815EF19 + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 special DrawWholeMapView - playsfx SE_BAN - setflag 2129 + playse SE_BAN + setflag FLAG_SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag 2129 - jumpeq IslandCave_EventScript_15EF72 - braillemsg IslandCave_Braille_1C54FC + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72 + braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate - jump IslandCave_EventScript_15EF95 + goto IslandCave_EventScript_15EF95 end IslandCave_EventScript_15EF72:: @ 815EF72 @@ -60,32 +57,31 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall - braillemsg IslandCave_Braille_1C54FC - checkflag 2129 - jumpeq IslandCave_EventScript_15EF95 + braillemessage IslandCave_Braille_1C54FC + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95 special DoBrailleWait waitstate - jump IslandCave_EventScript_15EF95 + goto IslandCave_EventScript_15EF95 end IslandCave_EventScript_15EF95:: @ 815EF95 - waitbutton - hidebox 0, 0, 29, 19 + waitbuttonpress + erasebox 0, 0, 29, 19 releaseall end IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer - checksound - pokecry SPECIES_REGICE, 2 - pause 40 - waitpokecry + waitse + playmoncry SPECIES_REGICE, 2 + delay 40 + waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE - setflag 936 - setflag 2145 - special StartBattle_Regi + setflag FLAG_HIDE_REGICE + setflag FLAG_SYS_CTRL_OBJ_DELETE + special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end |