summaryrefslogtreecommitdiff
path: root/data/mapObjects/ceruleangym.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/ceruleangym.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/ceruleangym.asm')
-rwxr-xr-xdata/mapObjects/ceruleangym.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm
index 23d06d53..d87c9c20 100755
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/ceruleangym.asm
@@ -8,9 +8,9 @@ CeruleanGymObject: ; 0x5c834 (size=50)
db $0 ; signs
db $4 ; objects
- object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, MISTY + $C8, $1
- object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, JR__TRAINER_F + $C8, $1
- object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, SWIMMER + $C8, $1
+ object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1
+ object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR__TRAINER_F, $1
+ object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person
; warp-to