diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/Route4.asm | |
| parent | f1285f8584ce7ff50ceb5e3134c0efc867209096 (diff) | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/Route4.asm')
| -rw-r--r-- | data/maps/objects/Route4.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 79e79b79..13f25a80 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -1,19 +1,19 @@ Route4_Object: db $2c ; border block - def_warps - warp 11, 5, 0, MT_MOON_POKECENTER - warp 18, 5, 0, MT_MOON_1F - warp 24, 5, 7, MT_MOON_B1F + def_warp_events + warp_event 11, 5, MT_MOON_POKECENTER, 0 + warp_event 18, 5, MT_MOON_1F, 0 + warp_event 24, 5, MT_MOON_B1F, 7 - def_signs - sign 12, 5, 4 ; PokeCenterSignText - sign 17, 7, 5 ; Route4Text5 - sign 27, 7, 6 ; Route4Text6 + def_bg_events + bg_event 12, 5, 4 ; PokeCenterSignText + bg_event 17, 7, 5 ; Route4Text5 + bg_event 27, 7, 6 ; Route4Text6 - def_objects - object SPRITE_COOLTRAINER_F, 9, 8, WALK, ANY_DIR, 1 ; person - object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 - object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND + def_object_events + object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person + object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 + object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND def_warps_to ROUTE_4 |