summaryrefslogtreecommitdiff
path: root/data/mapObjects/school.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/school.asm')
-rwxr-xr-xdata/mapObjects/school.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm
index 53f7fc00..8f07144f 100755
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/school.asm
@@ -1,16 +1,16 @@
SchoolObject:
db $a ; border block
- db $2 ; warps
- db $7, $2, $2, $ff
- db $7, $3, $2, $ff
+ db 2 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person
- object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person
+ db 2 ; objects
+ object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person
+ object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person
; warp-to
- EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2
- EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $3
+ warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH
+ warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH