summaryrefslogtreecommitdiff
path: root/data/mapObjects/fightingdojo.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/fightingdojo.asm')
-rwxr-xr-xdata/mapObjects/fightingdojo.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm
index f84f3ee7..44fed88f 100755
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/fightingdojo.asm
@@ -1,4 +1,4 @@
-FightingDojoObject: ; 0x5cf9b (size=72)
+FightingDojoObject:
db $3 ; border block
db $2 ; warps
@@ -7,14 +7,14 @@ FightingDojoObject: ; 0x5cf9b (size=72)
db $0 ; signs
- db $7 ; people
- db SPRITE_HIKER, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $1, BLACKBELT + $C8, $1
- db SPRITE_HIKER, $4 + 4, $3 + 4, $ff, $d3, TRAINER | $2, BLACKBELT + $C8, $2
- db SPRITE_HIKER, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $3, BLACKBELT + $C8, $3
- db SPRITE_HIKER, $5 + 4, $5 + 4, $ff, $d2, TRAINER | $4, BLACKBELT + $C8, $4
- db SPRITE_HIKER, $7 + 4, $5 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $5
- db SPRITE_BALL, $1 + 4, $4 + 4, $ff, $ff, $6 ; person
- db SPRITE_BALL, $1 + 4, $5 + 4, $ff, $ff, $7 ; person
+ db $7 ; objects
+ object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, OPP_BLACKBELT, $1
+ object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, OPP_BLACKBELT, $2
+ object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, OPP_BLACKBELT, $3
+ object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, OPP_BLACKBELT, $4
+ object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, OPP_BLACKBELT, $5
+ object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person
+ object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person
; warp-to
EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4