summaryrefslogtreecommitdiff
path: root/maps/BluesHouse.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-24 09:49:26 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-24 09:57:16 -0400
commitdcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch)
tree4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/BluesHouse.asm
parent89c47f21701caf32641573264d83ca16eb0aed91 (diff)
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/BluesHouse.asm')
-rw-r--r--maps/BluesHouse.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 56351efb7..55a38d1d5 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,10 +1,10 @@
- object_const_def ; object_event constants
+ object_const_def
const BLUESHOUSE_DAISY
BluesHouse_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
DaisyScript:
faceplayer
@@ -145,13 +145,13 @@ DaisyCantGroomEggText:
BluesHouse_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 2, 7, PALLET_TOWN, 2
warp_event 3, 7, PALLET_TOWN, 2
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 1 ; object events
+ def_object_events
object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1