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/SafariZoneNorth.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/SafariZoneNorth.asm')
| -rwxr-xr-x | data/maps/objects/SafariZoneNorth.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 06563243..edf391b0 100755 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,7 +1,7 @@ SafariZoneNorth_Object: db $0 ; border block - db 9 ; warps + def_warps warp 2, 35, 0, SAFARI_ZONE_WEST warp 3, 35, 1, SAFARI_ZONE_WEST warp 8, 35, 2, SAFARI_ZONE_WEST @@ -12,14 +12,14 @@ SafariZoneNorth_Object: warp 39, 31, 1, SAFARI_ZONE_EAST warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE - db 5 ; signs + def_signs sign 36, 4, 3 ; SafariZoneNorthText3 sign 4, 25, 4 ; SafariZoneNorthText4 sign 13, 31, 5 ; SafariZoneNorthText5 sign 19, 33, 6 ; SafariZoneNorthText6 sign 26, 28, 7 ; SafariZoneNorthText7 - db 2 ; objects + def_objects object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH |