summaryrefslogtreecommitdiff
path: root/maps/CherrygroveEvolutionSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CherrygroveEvolutionSpeechHouse.asm')
-rw-r--r--maps/CherrygroveEvolutionSpeechHouse.asm38
1 files changed, 16 insertions, 22 deletions
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index 94ad1cf91..7d7e17f0e 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -1,66 +1,60 @@
-CherrygroveEvolutionSpeechHouse_MapScriptHeader: ; 0x196cb0
- ; trigger count
+CherrygroveEvolutionSpeechHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x196cb2
-YoungsterScript_0x196cb2: ; 0x196cb2
+YoungsterScript_0x196cb2:
loadfont
writetext UnknownText_0x196cc3
closetext
loadmovesprites
end
-; 0x196cb9
-LassScript_0x196cb9: ; 0x196cb9
+LassScript_0x196cb9:
loadfont
writetext UnknownText_0x196cfc
closetext
loadmovesprites
end
-; 0x196cc0
CherrygroveEvolutionSpeechHouseBookshelf:
jumpstd magazinebookshelf
-UnknownText_0x196cc3: ; 0x196cc3
+UnknownText_0x196cc3:
text "#MON gain expe-"
line "rience in battle"
para "and change their"
line "form."
done
-; 0x196cfc
-UnknownText_0x196cfc: ; 0x196cfc
+UnknownText_0x196cfc:
text "#MON change?"
para "I would be shocked"
line "if one did that!"
done
-; 0x196d2e
-CherrygroveEvolutionSpeechHouse_MapEventHeader: ; 0x196d2e
+CherrygroveEvolutionSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $3, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 1, 0, $0, CherrygroveEvolutionSpeechHouseBookshelf
- signpost 1, 1, $0, CherrygroveEvolutionSpeechHouseBookshelf
+ signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf
+ signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, $ffff
- person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, $ffff
-; 0x196d62
+ person_event SPRITE_LASS, 9, 7, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x196cb9, -1
+ person_event SPRITE_YOUNGSTER, 9, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196cb2, -1