summaryrefslogtreecommitdiff
path: root/maps/DayCare.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/DayCare.asm')
-rw-r--r--maps/DayCare.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index 0f7b22f6b..45c2e37e8 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -1,11 +1,11 @@
- object_const_def ; object_event constants
+ object_const_def
const DAYCARE_GRAMPS
const DAYCARE_GRANNY
DayCare_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 1 ; callbacks
+ def_callbacks
callback MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback:
@@ -156,18 +156,18 @@ DayCareText_PartyFull:
DayCare_MapEvents:
db 0, 0 ; filler
- db 4 ; warp events
+ def_warp_events
warp_event 0, 5, ROUTE_34, 3
warp_event 0, 6, ROUTE_34, 4
warp_event 2, 7, ROUTE_34, 5
warp_event 3, 7, ROUTE_34, 5
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
- db 2 ; object events
+ def_object_events
object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1