From dd4f0a0064921f74fd68750848fca87ae21c4545 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 11:12:59 -0500 Subject: Use base 10 (note, the previous commit resolves #173) --- data/mapObjects/viridianforestexit.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/mapObjects/viridianforestexit.asm') diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 278f5770..2f098642 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -1,20 +1,20 @@ ViridianForestExitObject: - db $a ; border block + db 10 ; border block - db $4 ; warps - warp $4, $0, $1, $ff - warp $5, $0, $1, $ff - warp $4, $7, $0, VIRIDIAN_FOREST - warp $5, $7, $0, VIRIDIAN_FOREST + db 4 ; warps + warp 4, 0, 1, -1 + warp 5, 0, 1, -1 + warp 4, 7, 0, VIRIDIAN_FOREST + warp 5, 7, 0, VIRIDIAN_FOREST - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, NONE, $1 ; person - object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person + object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person ; warp-to - warp_to $4, $0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to $5, $0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to $4, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST - warp_to $5, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST -- cgit v1.3.1-sl0p