diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 16:54:59 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 16:54:59 -0400 |
| commit | e2c99f19103856426966e30cf1910d07995bb936 (patch) | |
| tree | 513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/PokemonMansion3F.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| download | pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.gz pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.xz pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.zip | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/PokemonMansion3F.asm')
| -rwxr-xr-x | data/maps/objects/PokemonMansion3F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index 86696592..8385bd70 100755 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -1,14 +1,14 @@ PokemonMansion3F_Object: db $1 ; border block - db 3 ; warps + def_warps warp 7, 10, 1, POKEMON_MANSION_2F warp 6, 1, 3, POKEMON_MANSION_2F warp 25, 14, 2, POKEMON_MANSION_2F - db 0 ; signs + def_signs - db 5 ; objects + def_objects object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8 object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION |