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/PokemonMansion1F.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/PokemonMansion1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansion1F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 70eef1a1..a6ef0ecb 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,21 +1,21 @@ PokemonMansion1F_Object: db $2e ; border block - def_warps - warp 4, 27, 0, LAST_MAP - warp 5, 27, 0, LAST_MAP - warp 6, 27, 0, LAST_MAP - warp 7, 27, 0, LAST_MAP - warp 5, 10, 0, POKEMON_MANSION_2F - warp 21, 23, 0, POKEMON_MANSION_B1F - warp 26, 27, 0, LAST_MAP - warp 27, 27, 0, LAST_MAP + def_warp_events + warp_event 4, 27, LAST_MAP, 0 + warp_event 5, 27, LAST_MAP, 0 + warp_event 6, 27, LAST_MAP, 0 + warp_event 7, 27, LAST_MAP, 0 + warp_event 5, 10, POKEMON_MANSION_2F, 0 + warp_event 21, 23, POKEMON_MANSION_B1F, 0 + warp_event 26, 27, LAST_MAP, 0 + warp_event 27, 27, LAST_MAP, 0 - def_signs + def_bg_events - def_objects - object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS + def_object_events + object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE + object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS def_warps_to POKEMON_MANSION_1F |