summaryrefslogtreecommitdiff
path: root/maps/CeruleanGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeruleanGym.asm')
-rw-r--r--maps/CeruleanGym.asm84
1 files changed, 46 insertions, 38 deletions
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index a15eeb496..a5d826eba 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -1,3 +1,11 @@
+const_value set 2
+ const CERULEANGYM_ROCKET
+ const CERULEANGYM_MISTY
+ const CERULEANGYM_SWIMMER_GIRL1
+ const CERULEANGYM_SWIMMER_GIRL2
+ const CERULEANGYM_SWIMMER_GUY
+ const CERULEANGYM_GYM_GUY
+
CeruleanGym_MapScriptHeader:
.MapTriggers:
db 2
@@ -17,35 +25,35 @@ UnknownScript_0x1883da:
end
UnknownScript_0x1883de:
- applymovement $2, MovementData_0x1884e3
+ applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
playsound SFX_TACKLE
- applymovement $2, MovementData_0x1884eb
+ applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb
playmusic MUSIC_ROCKET_ENCOUNTER
- loadfont
+ opentext
writetext UnknownText_0x1884fb
+ waitbutton
closetext
- loadmovesprites
- showemote EMOTE_SHOCK, $2, 15
- applymovement $2, MovementData_0x1884f7
- loadfont
+ showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15
+ applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7
+ opentext
writetext UnknownText_0x188574
+ waitbutton
closetext
- loadmovesprites
- applymovement $2, MovementData_0x1884f5
- loadfont
+ applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5
+ opentext
writetext UnknownText_0x1885a5
+ waitbutton
closetext
- loadmovesprites
- applymovement $2, MovementData_0x1884e8
+ applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8
playsound SFX_EXIT_BUILDING
- disappear $2
+ disappear CERULEANGYM_ROCKET
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
dotrigger $0
domaptrigger ROUTE_25, $1
domaptrigger POWER_PLANT, $0
- waitbutton
+ waitsfx
special RestartMapMusic
pause 15
spriteface PLAYER, DOWN
@@ -54,100 +62,100 @@ UnknownScript_0x1883de:
MistyScript_0x188432:
faceplayer
- loadfont
+ opentext
checkflag ENGINE_CASCADEBADGE
iftrue .FightDone
writetext UnknownText_0x188674
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x18870c, 0
loadtrainer MISTY, 1
startbattle
- returnafterbattle
+ reloadmapafterbattle
setevent EVENT_BEAT_MISTY
setevent EVENT_BEAT_SWIMMERF_DIANA
setevent EVENT_BEAT_SWIMMERF_BRIANA
setevent EVENT_BEAT_SWIMMERM_PARKER
- loadfont
+ opentext
writetext UnknownText_0x188768
playsound SFX_GET_BADGE
- waitbutton
+ waitsfx
setflag ENGINE_CASCADEBADGE
.FightDone
writetext UnknownText_0x188782
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmerfDiana:
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript
SwimmerfDianaScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x188856
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmerfBriana:
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript
SwimmerfBrianaScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x1888c0
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmermParker:
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript
SwimmermParkerScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x188943
+ waitbutton
closetext
- loadmovesprites
end
CeruleanGymGuyScript:
faceplayer
- loadfont
+ opentext
checkevent EVENT_BEAT_MISTY
iftrue .CeruleanGymGuyWinScript
writetext CeruleanGymGuyText
+ waitbutton
closetext
- loadmovesprites
end
.CeruleanGymGuyWinScript
writetext CeruleanGymGuyWinText
+ waitbutton
closetext
- loadmovesprites
end
-MapCeruleanGymSignpostItem0:
+CeruleanGymHiddenMachinePart:
dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
CeruleanGymStatue1:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue
- loadfont
+ opentext
writetext CeruleanGymNote1
+ waitbutton
closetext
- loadmovesprites
end
CeruleanGymStatue2:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue
- loadfont
+ opentext
writetext CeruleanGymNote2
+ waitbutton
closetext
- loadmovesprites
end
CeruleanGymStatue:
@@ -371,7 +379,7 @@ CeruleanGym_MapEventHeader:
.Signposts:
db 3
- signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0
+ signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart
signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1
signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2