diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/SafariZoneNorth.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/SafariZoneNorth.asm')
| -rw-r--r-- | data/maps/objects/SafariZoneNorth.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 2094e742..b783a926 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,26 +1,26 @@ SafariZoneNorth_Object: db $0 ; border block - def_warps - warp 2, 35, 0, SAFARI_ZONE_WEST - warp 3, 35, 1, SAFARI_ZONE_WEST - warp 8, 35, 2, SAFARI_ZONE_WEST - warp 9, 35, 3, SAFARI_ZONE_WEST - warp 20, 35, 4, SAFARI_ZONE_CENTER - warp 21, 35, 5, SAFARI_ZONE_CENTER - warp 39, 30, 0, SAFARI_ZONE_EAST - warp 39, 31, 1, SAFARI_ZONE_EAST - warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE + def_warp_events + warp_event 2, 35, SAFARI_ZONE_WEST, 0 + warp_event 3, 35, SAFARI_ZONE_WEST, 1 + warp_event 8, 35, SAFARI_ZONE_WEST, 2 + warp_event 9, 35, SAFARI_ZONE_WEST, 3 + warp_event 20, 35, SAFARI_ZONE_CENTER, 4 + warp_event 21, 35, SAFARI_ZONE_CENTER, 5 + warp_event 39, 30, SAFARI_ZONE_EAST, 0 + warp_event 39, 31, SAFARI_ZONE_EAST, 1 + warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 0 - 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 + def_bg_events + bg_event 36, 4, 3 ; SafariZoneNorthText3 + bg_event 4, 25, 4 ; SafariZoneNorthText4 + bg_event 13, 31, 5 ; SafariZoneNorthText5 + bg_event 19, 33, 6 ; SafariZoneNorthText6 + bg_event 26, 28, 7 ; SafariZoneNorthText7 - def_objects - object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN - object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH + def_object_events + object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH def_warps_to SAFARI_ZONE_NORTH |