diff options
Diffstat (limited to 'maps/VioletKylesHouse.asm')
| -rw-r--r-- | maps/VioletKylesHouse.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 4d903cb70..eb9062708 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE VioletKylesHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletKylesHousePokefanMScript: jumptextfaceplayer VioletKylesHousePokefanMText @@ -15,7 +13,7 @@ VioletKylesHousePokefanMScript: Kyle: faceplayer opentext - trade NPCTRADE_KYLE + trade NPC_TRADE_KYLE waitbutton closetext end @@ -33,21 +31,16 @@ VioletKylesHousePokefanMText: done VioletKylesHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 6, VIOLET_CITY - warp_def 4, 7, 6, VIOLET_CITY + db 2 ; warp events + warp_event 3, 7, VIOLET_CITY, 6 + warp_event 4, 7, VIOLET_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 - object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 + object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 |