diff options
Diffstat (limited to 'maps/SoulHouse.asm')
| -rw-r--r-- | maps/SoulHouse.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 4a2ddc61a..4bd994c93 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -78,8 +78,8 @@ SoulHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 6, LAVENDER_TOWN - warp_def $7, $5, 6, LAVENDER_TOWN + warp_def 4, 7, 6, LAVENDER_TOWN + warp_def 5, 7, 6, LAVENDER_TOWN .CoordEvents: db 0 @@ -89,7 +89,7 @@ SoulHouse_MapEventHeader: .ObjectEvents: db 4 - object_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 - object_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 - object_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 - object_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 + object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 + object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 |