diff options
Diffstat (limited to 'maps/SoulHouse.asm')
| -rw-r--r-- | maps/SoulHouse.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 15ac8e2b3..8c6a86128 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS const SOULHOUSE_GRANNY SoulHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrFuji: jumptextfaceplayer MrFujiText @@ -73,23 +71,18 @@ SoulHouseGrannyText: done SoulHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 7, 6, LAVENDER_TOWN - warp_def 5, 7, 6, LAVENDER_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - 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 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 7, LAVENDER_TOWN, 6 + warp_event 5, 7, LAVENDER_TOWN, 6 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + 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 |