diff options
Diffstat (limited to 'maps/CianwoodPhotoStudio.asm')
| -rw-r--r-- | maps/CianwoodPhotoStudio.asm | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index bbf2eb3d9..7c8bfcbbb 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x9e0e0: faceplayer @@ -16,7 +14,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special Special_PhotoStudio + special PhotoStudio waitbutton closetext end @@ -49,20 +47,15 @@ UnknownText_0x9e156: done CianwoodPhotoStudio_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, CIANWOOD_CITY - warp_def 3, 7, 5, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, CIANWOOD_CITY, 5 + warp_event 3, 7, CIANWOOD_CITY, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 |