summaryrefslogtreecommitdiff
path: root/data/maps/objects/BullHouse2.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-22 14:32:37 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-22 14:44:22 -0400
commite6a99b8f9e20f7058a140fe7f0668b17ce49c6eb (patch)
tree2081afd14167056953c8140699d35532d236938d /data/maps/objects/BullHouse2.asm
parent5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff)
Port updated map event macros
Diffstat (limited to 'data/maps/objects/BullHouse2.asm')
-rw-r--r--data/maps/objects/BullHouse2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/BullHouse2.asm b/data/maps/objects/BullHouse2.asm
index 286b8e8..6be8e42 100644
--- a/data/maps/objects/BullHouse2.asm
+++ b/data/maps/objects/BullHouse2.asm
@@ -7,14 +7,14 @@ SECTION "data/maps/objects/BullHouse2.asm", ROMX
BullHouse2_MapEvents::
dw $4000 ; unknown
- db 2 ; warp events
- warp_event 4, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47
- warp_event 5, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47
+ def_warp_events
+ warp_event 4, 7, BULL_FOREST, 3, 47
+ warp_event 5, 7, BULL_FOREST, 3, 47
- db 0 ; bg events
+ def_bg_events
- db 1 ; person events
- object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
+ def_object_events
+ object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0
BullHouse2_Blocks::
INCBIN "maps/BullHouse2.blk"