summaryrefslogtreecommitdiff
path: root/data/maps/objects/PlayerHouse1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PlayerHouse1F.asm')
-rw-r--r--data/maps/objects/PlayerHouse1F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/PlayerHouse1F.asm b/data/maps/objects/PlayerHouse1F.asm
index 4721993..3218ec8 100644
--- a/data/maps/objects/PlayerHouse1F.asm
+++ b/data/maps/objects/PlayerHouse1F.asm
@@ -7,20 +7,20 @@ SECTION "data/maps/objects/PlayerHouse1F.asm", ROMX
PlayerHouse1F_MapEvents::
dw $4000 ; unknown
- db 3 ; warp events
- warp_event 6, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48
- warp_event 7, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48
- warp_event 9, 0, 1, PLAYER_HOUSE_2F, wOverworldMapBlocks + 16
+ def_warp_events
+ warp_event 6, 7, SILENT_HILL, 1, 48
+ warp_event 7, 7, SILENT_HILL, 1, 48
+ warp_event 9, 0, PLAYER_HOUSE_2F, 1, 16
- db 5 ; bg events
- bg_event 0, 1, 0, 1
- bg_event 1, 1, 0, 2
- bg_event 2, 1, 0, 3
- bg_event 4, 1, 0, 4
- bg_event 5, 1, 0, 5
+ def_bg_events
+ bg_event 0, 1, 0, 1
+ bg_event 1, 1, 0, 2
+ bg_event 2, 1, 0, 3
+ bg_event 4, 1, 0, 4
+ bg_event 5, 1, 0, 5
- db 1 ; person events
- object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
+ def_object_events
+ object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0
PlayerHouse1F_Blocks::
INCBIN "maps/PlayerHouse1F.blk"