summaryrefslogtreecommitdiff
path: root/maps/PewterNidoranSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterNidoranSpeechHouse.asm')
-rw-r--r--maps/PewterNidoranSpeechHouse.asm34
1 files changed, 14 insertions, 20 deletions
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index 4fc54289d..a81ded4fa 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,51 +1,45 @@
-PewterNidoranSpeechHouse_MapScriptHeader: ; 0x1a2805
- ; trigger count
+PewterNidoranSpeechHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1a2807
-SuperNerdScript_0x1a2807: ; 0x1a2807
+SuperNerdScript_0x1a2807:
jumptextfaceplayer UnknownText_0x1a2814
-; 0x1a280a
-GrowlitheScript_0x1a280a: ; 0x1a280a
+GrowlitheScript_0x1a280a:
loadfont
writetext UnknownText_0x1a2825
cry NIDORAN_M
closetext
loadmovesprites
end
-; 0x1a2814
-UnknownText_0x1a2814: ; 0x1a2814
+UnknownText_0x1a2814:
text "NIDORAN, shake!"
done
-; 0x1a2825
-UnknownText_0x1a2825: ; 0x1a2825
+UnknownText_0x1a2825:
text "NIDORAN: Gau gau!"
done
-; 0x1a2838
-PewterNidoranSpeechHouse_MapEventHeader: ; 0x1a2838
+PewterNidoranSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY
warp_def $7, $3, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, $ffff
- person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, $ffff
-; 0x1a2862
+ person_event SPRITE_SUPER_NERD, 9, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1a2807, -1
+ person_event SPRITE_GROWLITHE, 9, 8, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x1a280a, -1