summaryrefslogtreecommitdiff
path: root/maps/LancesRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/LancesRoom.asm')
-rw-r--r--maps/LancesRoom.asm89
1 files changed, 47 insertions, 42 deletions
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 0a89ea3a7..db050db6d 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -1,3 +1,8 @@
+const_value set 2
+ const LANCESROOM_LANCE
+ const LANCESROOM_MARY
+ const LANCESROOM_OAK
+
LancesRoom_MapScriptHeader:
.MapTriggers:
db 2
@@ -38,93 +43,93 @@ UnknownScript_0x180e53:
earthquake 80
changeblock $4, $16, $34
reloadmappart
- loadmovesprites
+ closetext
dotrigger $1
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
end
UnknownScript_0x180e6a:
- special Special_RotatePalettesRightMusic
+ special Special_FadeOutMusic
applymovement PLAYER, MovementData_0x180f38
jump LanceScript_0x180e7b
UnknownScript_0x180e74:
- special Special_RotatePalettesRightMusic
+ special Special_FadeOutMusic
applymovement PLAYER, MovementData_0x180f3c
LanceScript_0x180e7b:
- spriteface $2, LEFT
- loadfont
+ spriteface LANCESROOM_LANCE, LEFT
+ opentext
writetext UnknownText_0x180f67
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x1810a4, 0
- setlasttalked $2
+ setlasttalked LANCESROOM_LANCE
loadtrainer CHAMPION, LANCE
startbattle
- reloadmapmusic
- returnafterbattle
+ dontrestartmapmusic
+ reloadmapafterbattle
setevent EVENT_BEAT_CHAMPION_LANCE
- loadfont
+ opentext
writetext UnknownText_0x181132
+ waitbutton
closetext
- loadmovesprites
playsound SFX_ENTER_DOOR
changeblock $4, $0, $b
reloadmappart
- loadmovesprites
+ closetext
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10
pause 30
- showemote EMOTE_SHOCK, $2, 15
- spriteface $2, DOWN
+ showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15
+ spriteface LANCESROOM_LANCE, DOWN
pause 10
spriteface PLAYER, DOWN
- appear $3
- applymovement $3, MovementData_0x180f41
- loadfont
+ appear LANCESROOM_MARY
+ applymovement LANCESROOM_MARY, MovementData_0x180f41
+ opentext
writetext UnknownText_0x1811dd
+ waitbutton
closetext
- loadmovesprites
- appear $4
- applymovement $4, MovementData_0x180f46
- follow $3, $4
- applymovement $3, MovementData_0x180f49
+ appear LANCESROOM_OAK
+ applymovement LANCESROOM_OAK, MovementData_0x180f46
+ follow LANCESROOM_MARY, LANCESROOM_OAK
+ applymovement LANCESROOM_MARY, MovementData_0x180f49
stopfollow
- spriteface $4, UP
- spriteface $2, LEFT
- loadfont
+ spriteface LANCESROOM_OAK, UP
+ spriteface LANCESROOM_LANCE, LEFT
+ opentext
writetext UnknownText_0x18121b
+ waitbutton
closetext
- loadmovesprites
- applymovement $3, MovementData_0x180f4c
+ applymovement LANCESROOM_MARY, MovementData_0x180f4c
spriteface PLAYER, LEFT
- loadfont
+ opentext
writetext UnknownText_0x18134b
+ waitbutton
closetext
- loadmovesprites
- applymovement $2, MovementData_0x180f4f
+ applymovement LANCESROOM_LANCE, MovementData_0x180f4f
spriteface PLAYER, UP
- loadfont
+ opentext
writetext UnknownText_0x18137b
+ waitbutton
closetext
- loadmovesprites
- follow $2, PLAYER
- spriteface $3, UP
- spriteface $4, UP
- applymovement $2, MovementData_0x180f53
+ follow LANCESROOM_LANCE, PLAYER
+ spriteface LANCESROOM_MARY, UP
+ spriteface LANCESROOM_OAK, UP
+ applymovement LANCESROOM_LANCE, MovementData_0x180f53
stopfollow
playsound SFX_EXIT_BUILDING
- disappear $2
+ disappear LANCESROOM_LANCE
applymovement PLAYER, MovementData_0x180f55
playsound SFX_EXIT_BUILDING
disappear PLAYER
- applymovement $3, MovementData_0x180f57
- showemote EMOTE_SHOCK, $3, 15
- loadfont
+ applymovement LANCESROOM_MARY, MovementData_0x180f57
+ showemote EMOTE_SHOCK, LANCESROOM_MARY, 15
+ opentext
writetext UnknownText_0x1813c5
pause 30
- loadmovesprites
- applymovement $3, MovementData_0x180f5b
+ closetext
+ applymovement LANCESROOM_MARY, MovementData_0x180f5b
special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d