diff options
Diffstat (limited to 'maps/CeruleanPoliceStation.asm')
| -rw-r--r-- | maps/CeruleanPoliceStation.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index ca77bf0cd..1c97dc0e5 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT CeruleanPoliceStation_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanPoliceStationFishingGuruScript: jumptextfaceplayer CeruleanPoliceStationFishingGuruText @@ -44,22 +42,17 @@ CeruleanDiglettText: done CeruleanPoliceStation_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, CERULEAN_CITY - warp_def 3, 7, 2, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, CERULEAN_CITY, 2 + warp_event 3, 7, CERULEAN_CITY, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 - object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 + db 3 ; object events + object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 + object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 |