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/Fonto.asm | |
| parent | 5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff) | |
Port updated map event macros
Diffstat (limited to 'data/maps/objects/Fonto.asm')
| -rw-r--r-- | data/maps/objects/Fonto.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm index 011235b..cae0c45 100644 --- a/data/maps/objects/Fonto.asm +++ b/data/maps/objects/Fonto.asm @@ -10,25 +10,25 @@ SECTION "data/maps/objects/Fonto.asm", ROMX Fonto_MapEvents:: dw $4000 ; unknown - db 5 ; warp events - warp_event 4, 3, 1, FONTO_ROCKET_HOUSE, wOverworldMapBlocks + 35 - warp_event 15, 4, 1, FONTO_MART, wOverworldMapBlocks + 56 - warp_event 3, 7, 1, FONTO_HOUSE, wOverworldMapBlocks + 66 - warp_event 3, 12, 1, FONTO_POKECENTER_1F, wOverworldMapBlocks + 114 - warp_event 16, 13, 1, FONTO_LAB, wOverworldMapBlocks + 121 + def_warp_events + warp_event 4, 3, FONTO_ROCKET_HOUSE, 1, 35 + warp_event 15, 4, FONTO_MART, 1, 56 + warp_event 3, 7, FONTO_HOUSE, 1, 66 + warp_event 3, 12, FONTO_POKECENTER_1F, 1, 114 + warp_event 16, 13, FONTO_LAB, 1, 121 - db 5 ; bg events - bg_event 15, 4, 0, 1 - bg_event 14, 6, 0, 2 - bg_event 4, 12, 0, 3 - bg_event 6, 12, 0, 4 + def_bg_events + bg_event 15, 4, 0, 1 + bg_event 14, 6, 0, 2 + bg_event 4, 12, 0, 3 + bg_event 6, 12, 0, 4 bg_event 10, 12, 0, 5 - db 4 ; person events - object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 Fonto_Blocks:: INCBIN "maps/Fonto.blk" |