diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /data/mapObjects/viridiangym.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/viridiangym.asm')
| -rwxr-xr-x | data/mapObjects/viridiangym.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index fb81788d..468b9022 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -8,15 +8,15 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs db $b ; objects - object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, GIOVANNI + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, COOLTRAINER_M + $C8, $9 - object SPRITE_HIKER, $b, $b, STAY, UP, $3, BLACKBELT + $C8, $6 - object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, TAMER + $C8, $3 - object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, BLACKBELT + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, COOLTRAINER_M + $C8, $a - object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, BLACKBELT + $C8, $8 - object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, TAMER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, COOLTRAINER_M + $C8, $1 + object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, OPP_GIOVANNI, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, OPP_COOLTRAINER_M, $9 + object SPRITE_HIKER, $b, $b, STAY, UP, $3, OPP_BLACKBELT, $6 + object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, OPP_TAMER, $3 + object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, OPP_BLACKBELT, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, OPP_COOLTRAINER_M, $a + object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, OPP_BLACKBELT, $8 + object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, OPP_TAMER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, OPP_COOLTRAINER_M, $1 object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE |