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/ViridianForest.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/ViridianForest.asm')
| -rw-r--r-- | data/maps/objects/ViridianForest.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 22d0b67a..87a93800 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,30 +1,30 @@ ViridianForest_Object: db $3 ; border block - def_warps - warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE - warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE - warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + def_warp_events + warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 2 + warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 + warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 + warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 + warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 + warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - def_signs - sign 24, 40, 9 ; ViridianForestText9 - sign 16, 32, 10 ; ViridianForestText10 - sign 26, 17, 11 ; ViridianForestText11 - sign 4, 24, 12 ; ViridianForestText12 - sign 18, 45, 13 ; ViridianForestText13 - sign 2, 1, 14 ; ViridianForestText14 + def_bg_events + bg_event 24, 40, 9 ; ViridianForestText9 + bg_event 16, 32, 10 ; ViridianForestText10 + bg_event 26, 17, 11 ; ViridianForestText11 + bg_event 4, 24, 12 ; ViridianForestText12 + bg_event 18, 45, 13 ; ViridianForestText13 + bg_event 2, 1, 14 ; ViridianForestText14 - def_objects - object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person - object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 - object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object SPRITE_YOUNGSTER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE - object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 6, POTION - object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL - object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person + def_object_events + object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person + object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 + object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 + object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, 5, ANTIDOTE + object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 6, POTION + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL + object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 8 ; person def_warps_to VIRIDIAN_FOREST |