diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/PokemonMansionB1F.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| parent | Comments explain the def_warps_to macros (diff) | |
| download | pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/PokemonMansionB1F.asm')
| -rwxr-xr-x | data/maps/objects/PokemonMansionB1F.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 0cb994ed..bf0ea0a4 100755 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -1,12 +1,12 @@ PokemonMansionB1F_Object: db $1 ; border block - db 1 ; warps + def_warps warp 23, 22, 5, POKEMON_MANSION_1F - db 0 ; signs + def_signs - db 8 ; objects + def_objects object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY @@ -16,5 +16,4 @@ PokemonMansionB1F_Object: object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY - ; warp-to - warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F + def_warps_to POKEMON_MANSION_B1F |