diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 14:32:37 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 14:44:22 -0400 |
| commit | e6a99b8f9e20f7058a140fe7f0668b17ce49c6eb (patch) | |
| tree | 2081afd14167056953c8140699d35532d236938d /data/maps/objects/StandOffice.asm | |
| parent | 5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff) | |
Port updated map event macros
Diffstat (limited to 'data/maps/objects/StandOffice.asm')
| -rw-r--r-- | data/maps/objects/StandOffice.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/StandOffice.asm b/data/maps/objects/StandOffice.asm index a85dbeb..d74f09a 100644 --- a/data/maps/objects/StandOffice.asm +++ b/data/maps/objects/StandOffice.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/StandOffice.asm", ROMX StandOffice_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 2, 7, 3, STAND, wOverworldMapBlocks + 58 - warp_event 3, 7, 3, STAND, wOverworldMapBlocks + 58 + def_warp_events + warp_event 2, 7, STAND, 3, 58 + warp_event 3, 7, STAND, 3, 58 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 13, 4, SPRITE_ROCKER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 13, 4, SPRITE_ROCKER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandOffice_Blocks:: INCBIN "maps/StandOffice.blk" |