summaryrefslogtreecommitdiff
path: root/maps/DragonsDenB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/DragonsDenB1F.asm')
-rw-r--r--maps/DragonsDenB1F.asm61
1 files changed, 36 insertions, 25 deletions
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index afeb0769a..b9b9ad2db 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,3 +1,14 @@
+const_value set 2
+ const DRAGONSDENB1F_POKE_BALL1
+ const DRAGONSDENB1F_CLAIR
+ const DRAGONSDENB1F_SILVER
+ const DRAGONSDENB1F_COOLTRAINER_M
+ const DRAGONSDENB1F_COOLTRAINER_F
+ const DRAGONSDENB1F_TWIN1
+ const DRAGONSDENB1F_TWIN2
+ const DRAGONSDENB1F_POKE_BALL2
+ const DRAGONSDENB1F_POKE_BALL3
+
DragonsDenB1F_MapScriptHeader:
.MapTriggers:
db 2
@@ -22,30 +33,30 @@ UnknownScript_0x18c89e:
UnknownScript_0x18c89f:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue UnknownScript_0x18c8a8
- disappear $4
+ disappear DRAGONSDENB1F_SILVER
return
UnknownScript_0x18c8a8:
checkcode VAR_WEEKDAY
if_equal TUESDAY, UnknownScript_0x18c8b5
if_equal THURSDAY, UnknownScript_0x18c8b5
- disappear $4
+ disappear DRAGONSDENB1F_SILVER
return
UnknownScript_0x18c8b5:
- appear $4
+ appear DRAGONSDENB1F_SILVER
return
UnknownScript_0x18c8b8:
- appear $3
+ appear DRAGONSDENB1F_CLAIR
loadfont
writetext UnknownText_0x18c9b8
pause 30
- loadmovesprites
+ closetext
showemote EMOTE_SHOCK, PLAYER, 15
spriteface PLAYER, LEFT
playmusic MUSIC_CLAIR
- applymovement $3, MovementData_0x18c9ae
+ applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9ae
loadfont
writetext UnknownText_0x18c9bf
keeptextopen
@@ -54,26 +65,26 @@ UnknownScript_0x18c8b8:
itemtotext TM_DRAGONBREATH, $0
writetext UnknownText_0x18c9fb
playsound SFX_ITEM
- waitbutton
+ waitsfx
itemnotify
setevent EVENT_GOT_TM24_DRAGONBREATH
writetext UnknownText_0x18ca0d
keeptextopen
writetext UnknownText_0x18caf1
+ waitbutton
closetext
- loadmovesprites
jump UnknownScript_0x18c8f9
UnknownScript_0x18c8f4:
writetext UnknownText_0x18ca8b
+ waitbutton
closetext
- loadmovesprites
UnknownScript_0x18c8f9:
- applymovement $3, MovementData_0x18c9b3
+ applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9b3
special Special_RotatePalettesRightMusic
pause 30
special RestartMapMusic
- disappear $3
+ disappear DRAGONSDENB1F_CLAIR
dotrigger $0
end
@@ -81,57 +92,57 @@ TrainerCooltrainermDarin:
trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript
CooltrainermDarinScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x18cd82
+ waitbutton
closetext
- loadmovesprites
end
TrainerCooltrainerfCara:
trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript
CooltrainerfCaraScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x18ce11
+ waitbutton
closetext
- loadmovesprites
end
TrainerTwinsLeaandpia1:
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script
TwinsLeaandpia1Script:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x18ced3
+ waitbutton
closetext
- loadmovesprites
end
TrainerTwinsLeaandpia2:
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script
TwinsLeaandpia2Script:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x18cf0f
+ waitbutton
closetext
- loadmovesprites
end
PokeBallScript_0x18c95a:
giveitem DRAGON_FANG
iffalse UnknownScript_0x18c970
- disappear $2
+ disappear DRAGONSDENB1F_POKE_BALL1
loadfont
itemtotext DRAGON_FANG, $0
writetext UnknownText_0x18cf41
playsound SFX_ITEM
- waitbutton
+ waitsfx
itemnotify
- loadmovesprites
+ closetext
end
UnknownScript_0x18c970:
@@ -140,8 +151,8 @@ UnknownScript_0x18c970:
writetext UnknownText_0x18cf41
keeptextopen
writetext UnknownText_0x18cf51
+ waitbutton
closetext
- loadmovesprites
end
SilverScript_0x18c97e:
@@ -151,16 +162,16 @@ SilverScript_0x18c97e:
checkevent EVENT_GAVE_KURT_APRICORNS
iftrue UnknownScript_0x18c995
writetext UnknownText_0x18cc83
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_GAVE_KURT_APRICORNS
special RestartMapMusic
end
UnknownScript_0x18c995:
writetext UnknownText_0x18cd2d
+ waitbutton
closetext
- loadmovesprites
special RestartMapMusic
end