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/pokemontower7.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/pokemontower7.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 76435c04..67adcd69 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,15 +1,15 @@ PokemonTower7Object: db $1 ; border block - db $1 ; warps - db $10, $9, $1, POKEMONTOWER_6 + db 1 ; warps + warp 9, 16, 1, POKEMONTOWER_6 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_JESSIE, $a, $8, STAY, DOWN, $1 - object SPRITE_JAMES, $b, $8, STAY, DOWN, $2 - object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $3 + db 3 ; objects + object SPRITE_JESSIE, 10, 8, STAY, DOWN, 1 + object SPRITE_JAMES, 11, 8, STAY, DOWN, 2 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3 ; warp-to - EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 + warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 |