summaryrefslogtreecommitdiff
path: root/maps/ViridianNicknameSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ViridianNicknameSpeechHouse.asm')
-rw-r--r--maps/ViridianNicknameSpeechHouse.asm50
1 files changed, 20 insertions, 30 deletions
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index b86ab2d46..f6479e7c9 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -1,38 +1,33 @@
-ViridianNicknameSpeechHouse_MapScriptHeader: ; 0x9ae38
- ; trigger count
+ViridianNicknameSpeechHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x9ae3a
-PokefanMScript_0x9ae3a: ; 0x9ae3a
+PokefanMScript_0x9ae3a:
jumptextfaceplayer UnknownText_0x9ae54
-; 0x9ae3d
-LassScript_0x9ae3d: ; 0x9ae3d
+LassScript_0x9ae3d:
jumptextfaceplayer UnknownText_0x9aecb
-; 0x9ae40
-MoltresScript_0x9ae40: ; 0x9ae40
+MoltresScript_0x9ae40:
loadfont
writetext UnknownText_0x9aefe
cry SPEAROW
closetext
loadmovesprites
end
-; 0x9ae4a
-GrowlitheScript_0x9ae4a: ; 0x9ae4a
+GrowlitheScript_0x9ae4a:
loadfont
writetext UnknownText_0x9af10
cry RATTATA
closetext
loadmovesprites
end
-; 0x9ae54
-UnknownText_0x9ae54: ; 0x9ae54
+UnknownText_0x9ae54:
text "Do you put a lot"
line "of thought into"
@@ -45,44 +40,39 @@ UnknownText_0x9ae54: ; 0x9ae54
para "the fun of trading"
line "with others."
done
-; 0x9aecb
-UnknownText_0x9aecb: ; 0x9aecb
+UnknownText_0x9aecb:
text "They're SPEARY--"
line "a SPEAROW--and"
cont "RATTEY--a RATTATA."
done
-; 0x9aefe
-UnknownText_0x9aefe: ; 0x9aefe
+UnknownText_0x9aefe:
text "SPEARY: Ch-chun!"
done
-; 0x9af10
-UnknownText_0x9af10: ; 0x9af10
+UnknownText_0x9af10:
text "RATTEY: Kikiii!"
done
-; 0x9af21
-ViridianNicknameSpeechHouse_MapEventHeader: ; 0x9af21
+ViridianNicknameSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
warp_def $7, $3, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 4
- person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, $ffff
- person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, $ffff
- person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, $ffff
- person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, $ffff
-; 0x9af65
+ person_event SPRITE_POKEFAN_M, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x9ae3a, -1
+ person_event SPRITE_LASS, 8, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9ae3d, -1
+ person_event SPRITE_MOLTRES, 6, 9, OW_UP | $12, $2, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MoltresScript_0x9ae40, -1
+ person_event SPRITE_GROWLITHE, 7, 10, OW_UP | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x9ae4a, -1