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/KantoGameCorner.asm | |
| parent | 5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff) | |
Port updated map event macros
Diffstat (limited to 'data/maps/objects/KantoGameCorner.asm')
| -rw-r--r-- | data/maps/objects/KantoGameCorner.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/objects/KantoGameCorner.asm b/data/maps/objects/KantoGameCorner.asm index 424a77a..4e09abe 100644 --- a/data/maps/objects/KantoGameCorner.asm +++ b/data/maps/objects/KantoGameCorner.asm @@ -7,25 +7,25 @@ SECTION "data/maps/objects/KantoGameCorner.asm", ROMX KantoGameCorner_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 8, 13, 14, KANTO, wOverworldMapBlocks + 117 - warp_event 9, 13, 14, KANTO, wOverworldMapBlocks + 117 - warp_event 10, 13, 14, KANTO, wOverworldMapBlocks + 118 - warp_event 11, 13, 14, KANTO, wOverworldMapBlocks + 118 + def_warp_events + warp_event 8, 13, KANTO, 14, 117 + warp_event 9, 13, KANTO, 14, 117 + warp_event 10, 13, KANTO, 14, 118 + warp_event 11, 13, KANTO, 14, 118 - db 0 ; bg events + def_bg_events - db 10 ; person events - object_event 3, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGameCorner_Blocks:: INCBIN "maps/KantoGameCorner.blk" |