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/pokemontower2.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/pokemontower2.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower2.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 33bc048d..96223a26 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -1,16 +1,16 @@ PokemonTower2Object: db $1 ; border block - db $2 ; warps - db $9, $3, $0, POKEMONTOWER_3 - db $9, $12, $2, POKEMONTOWER_1 + db 2 ; warps + warp 3, 9, 0, POKEMONTOWER_3 + warp 18, 9, 2, POKEMONTOWER_1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BLUE, $e, $5, STAY, NONE, $1 ; person - object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person + object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person ; warp-to - EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3 - EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1 + warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_3F + warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_1F |