summaryrefslogtreecommitdiff
path: root/maps/VioletNicknameSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletNicknameSpeechHouse.asm')
-rw-r--r--maps/VioletNicknameSpeechHouse.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 9545c6e36..fcb7cadb0 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -45,8 +45,8 @@ VioletNicknameSpeechHouse_MapEventHeader:
.Warps:
db 2
- warp_def $7, $3, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
- warp_def $7, $4, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
+ warp_def $7, $3, 4, VIOLET_CITY
+ warp_def $7, $4, 4, VIOLET_CITY
.XYTriggers:
db 0
@@ -56,6 +56,6 @@ VioletNicknameSpeechHouse_MapEventHeader:
.PersonEvents:
db 3
- person_event SPRITE_TEACHER, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x693e9, -1
- person_event SPRITE_LASS, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x693ec, -1
- person_event SPRITE_BIRD, 6, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x693ef, -1
+ person_event SPRITE_TEACHER, 7, 6, $9, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x693e9, -1
+ person_event SPRITE_LASS, 8, 10, $7, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, LassScript_0x693ec, -1
+ person_event SPRITE_BIRD, 6, 9, $5, 0, 1, -1, -1, 8 + PAL_OW_BROWN, 0, 0, BirdScript_0x693ef, -1