diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-03-27 14:11:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 14:11:59 -0500 |
| commit | e2e8bf6a8477af254ea7057028f72ac918b62005 (patch) | |
| tree | ffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/pokemontower3.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| parent | Removed EVENT_DISP (diff) | |
| download | pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/pokemontower3.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower3.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 9899276a..f8151f00 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -1,18 +1,18 @@ PokemonTower3Object: db $1 ; border block - db $2 ; warps - db $9, $3, $0, POKEMONTOWER_2 - db $9, $12, $1, POKEMONTOWER_4 + db 2 ; warps + warp 3, 9, 0, POKEMONTOWER_2 + warp 18, 9, 1, POKEMONTOWER_4 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, OPP_CHANNELER, $5 - object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, OPP_CHANNELER, $6 - object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, OPP_CHANNELER, $8 - object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE + db 4 ; objects + object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 + object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 + object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 + object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE ; warp-to - EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2 - EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4 + warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMON_TOWER_2F + warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMON_TOWER_4F |