summaryrefslogtreecommitdiff
path: root/maps/CianwoodLugiaSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CianwoodLugiaSpeechHouse.asm')
-rw-r--r--maps/CianwoodLugiaSpeechHouse.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 37f0dc306..c6621f9aa 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -1,8 +1,8 @@
CianwoodLugiaSpeechHouse_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
TeacherScript_0x9e1b0:
@@ -60,21 +60,21 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $3, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 1, 0, $0, CianwoodLugiaSpeechHouseBookshelf
- signpost 1, 1, $0, CianwoodLugiaSpeechHouseBookshelf
+ signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf
+ signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, -1
- person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, -1
- person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, -1
+ person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, TeacherScript_0x9e1b0, -1
+ person_event SPRITE_LASS, 9, 10, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9e1b3, -1
+ person_event SPRITE_TWIN, 6, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TwinScript_0x9e1b6, -1