summaryrefslogtreecommitdiff
path: root/data/mapObjects/fuchsiagym.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-10 11:09:16 -0500
commitdfc152d667e3695f83eb0fbabb839b0fad275ceb (patch)
tree37255b78ab19c520a651ec68ca10a9f43ebe07d7 /data/mapObjects/fuchsiagym.asm
parent31d267d4ad87042dbdd30be645ad4b43e4e3ceb1 (diff)
No more $C8
Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers
Diffstat (limited to 'data/mapObjects/fuchsiagym.asm')
-rwxr-xr-xdata/mapObjects/fuchsiagym.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm
index 1d082f62..ded17031 100755
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/fuchsiagym.asm
@@ -8,13 +8,13 @@ FuchsiaGymObject: ; 0x75658 (size=82)
db $0 ; signs
db $8 ; objects
- object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, KOGA + $C8, $1
- object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, JUGGLER + $C8, $7
- object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, JUGGLER + $C8, $3
- object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, JUGGLER + $C8, $8
- object SPRITE_ROCKER, $3, $5, STAY, UP, $5, TAMER + $C8, $1
- object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, TAMER + $C8, $2
- object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, JUGGLER + $C8, $4
+ object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1
+ object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7
+ object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3
+ object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8
+ object SPRITE_ROCKER, $3, $5, STAY, UP, $5, OPP_TAMER, $1
+ object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, OPP_TAMER, $2
+ object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, OPP_JUGGLER, $4
object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person
; warp-to