diff options
Diffstat (limited to 'maps/OlivineCafe.asm')
| -rw-r--r-- | maps/OlivineCafe.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 269357d21..6e3ffbe5f 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINECAFE_SAILOR1 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 OlivineCafe_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SailorScript_0x9c8c1: faceplayer @@ -79,22 +77,17 @@ OlivineCafeSailorText: done OlivineCafe_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, OLIVINE_CITY - warp_def 3, 7, 7, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 7 + warp_event 3, 7, OLIVINE_CITY, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 - object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 + db 3 ; object events + object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 + object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 |