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/Route15.asm | |
| parent | 5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff) | |
Port updated map event macros
Diffstat (limited to 'data/maps/objects/Route15.asm')
| -rw-r--r-- | data/maps/objects/Route15.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 5fcd48f..6432ab3 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -9,18 +9,18 @@ SECTION "data/maps/objects/Route15.asm", ROMX Route15_MapEvents:: dw $4000 ; unknown - db 7 ; warp events - warp_event 8, 5, 1, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 - warp_event 9, 5, 2, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 - warp_event 9, 10, 1, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 131 - warp_event 14, 12, 6, ROUTE_15, wOverworldMapBlocks + 155 - warp_event 14, 13, 7, ROUTE_15, wOverworldMapBlocks + 155 - warp_event 21, 8, 4, ROUTE_15, wOverworldMapBlocks + 116 - warp_event 21, 9, 5, ROUTE_15, wOverworldMapBlocks + 116 + def_warp_events + warp_event 8, 5, BAADON_ROUTE_GATE_NEWTYPE, 1, 68 + warp_event 9, 5, BAADON_ROUTE_GATE_NEWTYPE, 2, 68 + warp_event 9, 10, ROUTE_15_POKECENTER_1F, 1, 131 + warp_event 14, 12, ROUTE_15, 6, 155 + warp_event 14, 13, ROUTE_15, 7, 155 + warp_event 21, 8, ROUTE_15, 4, 116 + warp_event 21, 9, ROUTE_15, 5, 116 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Route15_Blocks:: INCBIN "maps/Route15.blk" |