summaryrefslogtreecommitdiff
path: root/data/mapObjects/pewtergym.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/pewtergym.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/pewtergym.asm')
-rwxr-xr-xdata/mapObjects/pewtergym.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm
index 13909781..69196193 100755
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -8,8 +8,8 @@ PewterGymObject: ; 0x5c52e (size=42)
db $0 ; signs
db $3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, BROCK + $C8, $1
- object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, JR__TRAINER_M + $C8, $1
+ object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1
+ object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person
; warp-to