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/SSAnne2FRooms.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/SSAnne2FRooms.asm')
| -rwxr-xr-x | data/maps/objects/SSAnne2FRooms.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 454b4c6b..f99ac966 100755 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,7 +1,7 @@ SSAnne2FRooms_Object: db $c ; border block - db 12 ; warps + def_warps warp 2, 5, 0, SS_ANNE_2F warp 3, 5, 0, SS_ANNE_2F warp 12, 5, 1, SS_ANNE_2F @@ -15,9 +15,9 @@ SSAnne2FRooms_Object: warp 22, 15, 5, SS_ANNE_2F warp 23, 15, 5, SS_ANNE_2F - db 0 ; signs + def_signs - db 13 ; objects + def_objects object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 |