summaryrefslogtreecommitdiff
path: root/maps/MrPsychicsHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MrPsychicsHouse.asm')
-rw-r--r--maps/MrPsychicsHouse.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 0a4c811aa..182d7f30c 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,8 +1,8 @@
MrPsychicsHouse_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
MrPsychic:
@@ -48,19 +48,19 @@ MrPsychicsHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $7, $3, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 1, 0, $0, MrPsychicsHouseBookshelf
- signpost 1, 1, $0, MrPsychicsHouseBookshelf
+ signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf
+ signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, -1
+ person_event SPRITE_FISHING_GURU, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MrPsychic, -1