summaryrefslogtreecommitdiff
path: root/data/mapObjects/route18.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/route18.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/route18.asm')
-rwxr-xr-xdata/mapObjects/route18.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm
index 7fd24383..88547941 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -12,9 +12,9 @@ Route18Object: ; 0x58c5a (size=66)
db $5, $21, $5 ; Route18Text5
db $3 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $8
- object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, BIRD_KEEPER + $C8, $9
- object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, BIRD_KEEPER + $C8, $a
+ object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8
+ object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, OPP_BIRD_KEEPER, $9
+ object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a
; warp-to
EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F