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/lab4.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/lab4.asm')
| -rwxr-xr-x | data/mapObjects/lab4.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 361f9533..b9956f5f 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -1,16 +1,16 @@ Lab4Object: db $17 ; border block - db $2 ; warps - db $7, $2, $4, CINNABAR_LAB_1 - db $7, $3, $4, CINNABAR_LAB_1 + db 2 ; warps + warp 2, 7, 4, CINNABAR_LAB_1 + warp 3, 7, 4, CINNABAR_LAB_1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_OAK_AIDE, $5, $2, WALK, $2, $1 ; person - object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person + db 2 ; objects + object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person + object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 + warp_to 3, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 |