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/PokemonMansion2F.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/PokemonMansion2F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansion2F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 8d504eef..4b59a896 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,18 +1,18 @@ PokemonMansion2F_Object: db $1 ; border block - def_warps - warp 5, 10, 4, POKEMON_MANSION_1F - warp 7, 10, 0, POKEMON_MANSION_3F - warp 25, 14, 2, POKEMON_MANSION_3F - warp 6, 1, 1, POKEMON_MANSION_3F + def_warp_events + warp_event 5, 10, POKEMON_MANSION_1F, 4 + warp_event 7, 10, POKEMON_MANSION_3F, 0 + warp_event 25, 14, POKEMON_MANSION_3F, 2 + warp_event 6, 1, POKEMON_MANSION_3F, 1 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 3, 17, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 - object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person + def_object_events + object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 + object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM + object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person + object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person def_warps_to POKEMON_MANSION_2F |