summaryrefslogtreecommitdiff
path: root/data/scripts/maps/CaveOfOrigin_B4F.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/CaveOfOrigin_B4F.inc')
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc56
1 files changed, 28 insertions, 28 deletions
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index e9f23ff5a..c6c3cd45e 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -5,69 +5,69 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
checkflag 2145
- callif 1, CaveOfOrigin_B4F_EventScript_15DDC1
+ call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1
end
CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1
- disappear 1
+ removeobject 1
return
CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
.ifdef SAPPHIRE
- setmapfooter 163
+ setmaplayoutindex 163
.else
- setmapfooter 313
+ setmaplayoutindex 313
.endif
call CaveOfOrigin_B4F_EventScript_1A01B5
checkflag 113
- callif 1, CaveOfOrigin_B4F_EventScript_1A04E3
+ call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3
end
CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
lockall
- move 255, CaveOfOrigin_B4F_Movement_1A0841
- waitmove 0
+ applymovement 255, CaveOfOrigin_B4F_Movement_1A0841
+ waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B4F03, 4
.else
msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
.endif
- closebutton
+ closemessage
setweather 0
doweather
- special 284
+ special WaitWeather
waitstate
- playsfx 209
- setanimation 0, 9
- setanimation 1, 13
- setanimation 2, 0
- doanimation 54
- checkanimation 54
+ playse 209
+ setfieldeffect 0, 9
+ setfieldeffect 1, 13
+ setfieldeffect 2, 0
+ dofieldeffect 54
+ waitfieldeffect 54
.ifdef SAPPHIRE
setvar RESULT, 3
.else
setvar RESULT, 2
.endif
- playsfx 107
- special 281
+ playse 107
+ special sub_80818A4
waitstate
- special 282
+ special sub_80818FC
waitstate
- move 1, CaveOfOrigin_B4F_Movement_15DE7D
- waitmove 0
- pause 60
+ applymovement 1, CaveOfOrigin_B4F_Movement_15DE7D
+ waitmovement 0
+ delay 60
setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE
- checksound
- pokecry SPECIES_GROUDON_OR_KYOGRE, 2
- pause 40
+ waitse
+ playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
+ delay 40
waitpokecry
setflag 2145
- special 311
+ special ScrSpecial_StartGroudonKyogreBattle
waitstate
clearflag 2145
- specialval RESULT, 180
+ specialvar RESULT, sub_810E300
compare RESULT, 1
- callif 1, CaveOfOrigin_B4F_EventScript_15DE73
+ call_if 1, CaveOfOrigin_B4F_EventScript_15DE73
setflag 816
setflag 855
setflag 856
@@ -87,7 +87,7 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
.else
msgbox CaveOfOrigin_B4F_Text_1B5009, 4
.endif
- closebutton
+ closemessage
return
CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D