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/SafariZoneWest.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/SafariZoneWest.asm')
| -rwxr-xr-x | data/maps/objects/SafariZoneWest.asm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index 2e0692c1..5e170cbc 100755 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -1,7 +1,7 @@ SafariZoneWest_Object: db $0 ; border block - db 8 ; warps + def_warps warp 20, 0, 0, SAFARI_ZONE_NORTH warp 21, 0, 1, SAFARI_ZONE_NORTH warp 26, 0, 2, SAFARI_ZONE_NORTH @@ -11,24 +11,16 @@ SafariZoneWest_Object: warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE - db 4 ; signs + def_signs sign 12, 12, 5 ; SafariZoneWestText5 sign 17, 3, 6 ; SafariZoneWestText6 sign 26, 4, 7 ; SafariZoneWestText7 sign 24, 22, 8 ; SafariZoneWestText8 - db 4 ; objects + def_objects object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH - ; warp-to - warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE + def_warps_to SAFARI_ZONE_WEST |