summaryrefslogtreecommitdiff
path: root/maps/CeruleanTradeSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeruleanTradeSpeechHouse.asm')
-rw-r--r--maps/CeruleanTradeSpeechHouse.asm50
1 files changed, 20 insertions, 30 deletions
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 2efba93ad..b0451d91c 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -1,80 +1,70 @@
-CeruleanTradeSpeechHouse_MapScriptHeader: ; 0x188131
- ; trigger count
+CeruleanTradeSpeechHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x188133
-GrannyScript_0x188133: ; 0x188133
+GrannyScript_0x188133:
jumptextfaceplayer UnknownText_0x18814d
-; 0x188136
-GrampsScript_0x188136: ; 0x188136
+GrampsScript_0x188136:
jumptextfaceplayer UnknownText_0x18818a
-; 0x188139
-RhydonScript_0x188139: ; 0x188139
+RhydonScript_0x188139:
loadfont
writetext UnknownText_0x18819c
cry KANGASKHAN
closetext
loadmovesprites
end
-; 0x188143
-ZubatScript_0x188143: ; 0x188143
+ZubatScript_0x188143:
loadfont
writetext UnknownText_0x1881b5
cry ZUBAT
closetext
loadmovesprites
end
-; 0x18814d
-UnknownText_0x18814d: ; 0x18814d
+UnknownText_0x18814d:
text "My husband lives"
line "happily with #-"
cont "MON he got through"
cont "trades."
done
-; 0x18818a
-UnknownText_0x18818a: ; 0x18818a
+UnknownText_0x18818a:
text "Ah… I'm so happy…"
done
-; 0x18819c
-UnknownText_0x18819c: ; 0x18819c
+UnknownText_0x18819c:
text "KANGASKHAN: Garu"
line "garuu."
done
-; 0x1881b5
-UnknownText_0x1881b5: ; 0x1881b5
+UnknownText_0x1881b5:
text "ZUBAT: Zuba zubaa."
done
-; 0x1881c9
-CeruleanTradeSpeechHouse_MapEventHeader: ; 0x1881c9
+CeruleanTradeSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $3, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 4
- person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, $ffff
- person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, $ffff
- person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, $ffff
- person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, $ffff
-; 0x18820d
+ person_event SPRITE_GRANNY, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x188133, -1
+ person_event SPRITE_GRAMPS, 6, 5, OW_DOWN | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x188136, -1
+ person_event SPRITE_RHYDON, 6, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, RhydonScript_0x188139, -1
+ person_event SPRITE_ZUBAT, 10, 9, OW_UP | $12, $0, -1, -1, $0, 0, ZubatScript_0x188143, -1