summaryrefslogtreecommitdiff
path: root/maps/BrunosRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BrunosRoom.asm')
-rw-r--r--maps/BrunosRoom.asm19
1 files changed, 11 insertions, 8 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index a862137de..9971b0f7c 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -1,3 +1,6 @@
+const_value set 2
+ const BRUNOSROOM_BRUNO
+
BrunosRoom_MapScriptHeader:
.MapTriggers:
db 2
@@ -38,10 +41,10 @@ UnknownScript_0x1809ad:
earthquake 80
changeblock $4, $e, $2a
reloadmappart
- loadmovesprites
+ closetext
dotrigger $1
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
- waitbutton
+ waitsfx
end
BrunoScript_0x1809c5:
@@ -50,29 +53,29 @@ BrunoScript_0x1809c5:
checkevent EVENT_BEAT_ELITE_4_BRUNO
iftrue UnknownScript_0x1809f3
writetext UnknownText_0x1809fe
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x180b23, 0
- loadtrainer BRUNO, 1
+ scriptedtrainerdata BRUNO, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_ELITE_4_BRUNO
loadfont
writetext UnknownText_0x180b3c
+ waitbutton
closetext
- loadmovesprites
playsound SFX_ENTER_DOOR
changeblock $4, $2, $16
reloadmappart
- loadmovesprites
+ closetext
setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
- waitbutton
+ waitsfx
end
UnknownScript_0x1809f3:
writetext UnknownText_0x180b3c
+ waitbutton
closetext
- loadmovesprites
end
MovementData_0x1809f9: