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/CeladonMart3F.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/CeladonMart3F.asm')
| -rw-r--r-- | data/maps/objects/CeladonMart3F.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index e1e8c8f2..c9f65f9a 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,30 +1,30 @@ CeladonMart3F_Object: db $f ; border block - def_warps - warp 12, 1, 0, CELADON_MART_4F - warp 16, 1, 1, CELADON_MART_2F - warp 1, 1, 0, CELADON_MART_ELEVATOR + def_warp_events + warp_event 12, 1, CELADON_MART_4F, 0 + warp_event 16, 1, CELADON_MART_2F, 1 + warp_event 1, 1, CELADON_MART_ELEVATOR, 0 - def_signs - sign 2, 4, 6 ; CeladonMart3Text6 - sign 3, 4, 7 ; CeladonMart3Text7 - sign 5, 4, 8 ; CeladonMart3Text8 - sign 6, 4, 9 ; CeladonMart3Text9 - sign 2, 6, 10 ; CeladonMart3Text10 - sign 3, 6, 11 ; CeladonMart3Text11 - sign 5, 6, 12 ; CeladonMart3Text12 - sign 6, 6, 13 ; CeladonMart3Text13 - sign 14, 1, 14 ; CeladonMart3Text14 - sign 4, 1, 15 ; CeladonMart3Text15 - sign 6, 1, 16 ; CeladonMart3Text16 - sign 10, 1, 17 ; CeladonMart3Text17 + def_bg_events + bg_event 2, 4, 6 ; CeladonMart3Text6 + bg_event 3, 4, 7 ; CeladonMart3Text7 + bg_event 5, 4, 8 ; CeladonMart3Text8 + bg_event 6, 4, 9 ; CeladonMart3Text9 + bg_event 2, 6, 10 ; CeladonMart3Text10 + bg_event 3, 6, 11 ; CeladonMart3Text11 + bg_event 5, 6, 12 ; CeladonMart3Text12 + bg_event 6, 6, 13 ; CeladonMart3Text13 + bg_event 14, 1, 14 ; CeladonMart3Text14 + bg_event 4, 1, 15 ; CeladonMart3Text15 + bg_event 6, 1, 16 ; CeladonMart3Text16 + bg_event 10, 1, 17 ; CeladonMart3Text17 - def_objects - object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person - object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person - object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person - object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person - object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person + def_object_events + object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person + object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person + object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person + object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person + object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person def_warps_to CELADON_MART_3F |