summaryrefslogtreecommitdiff
path: root/maps/KrissHouse2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/KrissHouse2F.asm')
-rw-r--r--maps/KrissHouse2F.asm18
1 files changed, 12 insertions, 6 deletions
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
index 4275dd8ee..eb7c827a4 100644
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -1,3 +1,9 @@
+const_value set 2
+ const KRISSHOUSE2F_CONSOLE
+ const KRISSHOUSE2F_DOLL_1
+ const KRISSHOUSE2F_DOLL_2
+ const KRISSHOUSE2F_BIG_DOLL
+
KrissHouse2F_MapScriptHeader:
.MapTriggers:
db 0
@@ -57,7 +63,7 @@ KrissHouseRadio:
checkevent EVENT_LISTENED_TO_INITIAL_RADIO
iftrue .AbbreviatedRadio
playmusic MUSIC_POKEMON_TALK
- loadfont
+ opentext
writetext KrisRadioText1
pause 45
writetext KrisRadioText2
@@ -67,7 +73,7 @@ KrissHouseRadio:
musicfadeout MUSIC_NEW_BARK_TOWN, $10
writetext KrisRadioText4
pause 45
- loadmovesprites
+ closetext
setevent EVENT_LISTENED_TO_INITIAL_RADIO
end
@@ -75,20 +81,20 @@ KrissHouseRadio:
jumpstd radio1
.AbbreviatedRadio
- loadfont
+ opentext
writetext KrisRadioText4
pause 45
- loadmovesprites
+ closetext
end
KrissHouseBookshelf:
jumpstd picturebookshelf
KrissHousePC:
- loadfont
+ opentext
special Special_KrissHousePC
iftrue .Warp
- loadmovesprites
+ closetext
end
.Warp
warp NONE, $0, $0