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/LavenderTown.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
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/LavenderTown.asm')
| -rw-r--r-- | data/maps/objects/LavenderTown.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index f34659c1..6e855efb 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,25 +1,25 @@ LavenderTown_Object: db $2c ; border block - def_warps - warp 3, 5, 0, LAVENDER_POKECENTER - warp 14, 5, 0, POKEMON_TOWER_1F - warp 7, 9, 0, MR_FUJIS_HOUSE - warp 15, 13, 0, LAVENDER_MART - warp 3, 13, 0, LAVENDER_CUBONE_HOUSE - warp 7, 13, 0, NAME_RATERS_HOUSE + def_warp_events + warp_event 3, 5, LAVENDER_POKECENTER, 0 + warp_event 14, 5, POKEMON_TOWER_1F, 0 + warp_event 7, 9, MR_FUJIS_HOUSE, 0 + warp_event 15, 13, LAVENDER_MART, 0 + warp_event 3, 13, LAVENDER_CUBONE_HOUSE, 0 + warp_event 7, 13, NAME_RATERS_HOUSE, 0 - def_signs - sign 11, 9, 4 ; LavenderTownText4 - sign 9, 3, 5 ; LavenderTownText5 - sign 16, 13, 6 ; MartSignText - sign 4, 5, 7 ; PokeCenterSignText - sign 5, 9, 8 ; LavenderTownText8 - sign 17, 7, 9 ; LavenderTownText9 + def_bg_events + bg_event 11, 9, 4 ; LavenderTownText4 + bg_event 9, 3, 5 ; LavenderTownText5 + bg_event 16, 13, 6 ; MartSignText + bg_event 4, 5, 7 ; PokeCenterSignText + bg_event 5, 9, 8 ; LavenderTownText8 + bg_event 17, 7, 9 ; LavenderTownText9 - def_objects - object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person - object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person - object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person + def_object_events + object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person + object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person + object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person def_warps_to LAVENDER_TOWN |