summaryrefslogtreecommitdiff
path: root/maps/BluesHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BluesHouse.asm')
-rw-r--r--maps/BluesHouse.asm76
1 files changed, 30 insertions, 46 deletions
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index dfc68e96b..c4ed75fe3 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,24 +1,22 @@
-BluesHouse_MapScriptHeader: ; 0x19b0ce
- ; trigger count
+BluesHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x19b0d0
-DaisyScript_0x19b0d0: ; 0x19b0d0
+DaisyScript_0x19b0d0:
faceplayer
loadfont
- checkcode $a
+ checkcode VAR_HOUR
if_equal $f, UnknownScript_0x19b0de
writetext UnknownText_0x19b130
closetext
loadmovesprites
end
-; 0x19b0de
-UnknownScript_0x19b0de: ; 0x19b0de
- checkflag $005c
+UnknownScript_0x19b0de:
+ checkflag ENGINE_TEA_IN_BLUES_HOUSE
iftrue UnknownScript_0x19b11e
writetext UnknownText_0x19b1b6
yesorno
@@ -26,16 +24,16 @@ UnknownScript_0x19b0de: ; 0x19b0de
writetext UnknownText_0x19b244
closetext
special Function741d
- if_equal $0, UnknownScript_0x19b124
- if_equal $1, UnknownScript_0x19b12a
- setflag $005c
+ if_equal 0, UnknownScript_0x19b124
+ if_equal 1, UnknownScript_0x19b12a
+ setflag ENGINE_TEA_IN_BLUES_HOUSE
writetext UnknownText_0x19b266
closetext
loadmovesprites
- special Function8c084
+ special FadeBlackBGMap
playmusic MUSIC_HEAL
pause 60
- special Function8c079
+ special FadeInBGMap
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296
@@ -45,30 +43,26 @@ UnknownScript_0x19b0de: ; 0x19b0de
closetext
loadmovesprites
end
-; 0x19b11e
-UnknownScript_0x19b11e: ; 0x19b11e
+UnknownScript_0x19b11e:
writetext UnknownText_0x19b2fa
closetext
loadmovesprites
end
-; 0x19b124
-UnknownScript_0x19b124: ; 0x19b124
+UnknownScript_0x19b124:
writetext UnknownText_0x19b334
closetext
loadmovesprites
end
-; 0x19b12a
-UnknownScript_0x19b12a: ; 0x19b12a
+UnknownScript_0x19b12a:
writetext UnknownText_0x19b377
closetext
loadmovesprites
end
-; 0x19b130
-UnknownText_0x19b130: ; 0x19b130
+UnknownText_0x19b130:
text "DAISY: Hi! My kid"
line "brother is the GYM"
@@ -81,9 +75,8 @@ UnknownText_0x19b130: ; 0x19b130
para "it causes problems"
line "for the trainers."
done
-; 0x19b1b6
-UnknownText_0x19b1b6: ; 0x19b1b6
+UnknownText_0x19b1b6:
text "DAISY: Hi! Good"
line "timing. I'm about"
cont "to have some tea."
@@ -97,29 +90,25 @@ UnknownText_0x19b1b6: ; 0x19b1b6
para "Would you like me"
line "to groom one?"
done
-; 0x19b244
-UnknownText_0x19b244: ; 0x19b244
+UnknownText_0x19b244:
text "DAISY: Which one"
line "should I groom?"
done
-; 0x19b266
-UnknownText_0x19b266: ; 0x19b266
+UnknownText_0x19b266:
text "DAISY: OK, I'll"
line "get it looking"
cont "nice in no time."
done
-; 0x19b296
-UnknownText_0x19b296: ; 0x19b296
+UnknownText_0x19b296:
text_from_ram StringBuffer3
text " looks"
line "content."
done
-; 0x19b2aa
-UnknownText_0x19b2aa: ; 0x19b2aa
+UnknownText_0x19b2aa:
text "DAISY: There you"
line "go! All done."
@@ -129,49 +118,44 @@ UnknownText_0x19b2aa: ; 0x19b2aa
para "It's such a cute"
line "#MON."
done
-; 0x19b2fa
-UnknownText_0x19b2fa: ; 0x19b2fa
+UnknownText_0x19b2fa:
text "DAISY: I always"
line "have tea around"
para "this time. Come"
line "join me."
done
-; 0x19b334
-UnknownText_0x19b334: ; 0x19b334
+UnknownText_0x19b334:
text "DAISY: You don't"
line "want to have one"
para "groomed? OK, we'll"
line "just have tea."
done
-; 0x19b377
-UnknownText_0x19b377: ; 0x19b377
+UnknownText_0x19b377:
text "DAISY: Oh, sorry."
line "I honestly can't"
cont "groom an EGG."
done
-; 0x19b3a8
-BluesHouse_MapEventHeader: ; 0x19b3a8
+BluesHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
warp_def $7, $3, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff
-; 0x19b3c5
+ person_event SPRITE_DAISY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1