summaryrefslogtreecommitdiff
path: root/maps/CeladonMansionRoofHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonMansionRoofHouse.asm')
-rw-r--r--maps/CeladonMansionRoofHouse.asm31
1 files changed, 12 insertions, 19 deletions
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index f49d12535..61157e619 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+ const_def 2 ; object constants
const CELADONMANSIONROOFHOUSE_PHARMACIST
CeladonMansionRoofHouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PharmacistScript_0x71afd:
faceplayer
@@ -15,7 +13,7 @@ PharmacistScript_0x71afd:
iftrue UnknownScript_0x71b21
writetext UnknownText_0x71b27
buttonsound
- checknite
+ checktime NITE
iftrue UnknownScript_0x71b14
writetext UnknownText_0x71b4a
waitbutton
@@ -117,20 +115,15 @@ UnknownText_0x71db3:
done
CeladonMansionRoofHouse_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 2
- warp_def 2, 7, 3, CELADON_MANSION_ROOF
- warp_def 3, 7, 3, CELADON_MANSION_ROOF
+ db 2 ; warp events
+ warp_event 2, 7, CELADON_MANSION_ROOF, 3
+ warp_event 3, 7, CELADON_MANSION_ROOF, 3
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
- object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
+ db 1 ; object events
+ object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1