diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-19 23:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 23:04:16 -0400 |
| commit | 0177688ad4d923c4970009fa87df48605bb43ed6 (patch) | |
| tree | 4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/maps/objects/VictoryRoad3F.asm | |
| parent | d44c7c305c3f94b59e3e2c008408779836a0020a (diff) | |
| parent | df62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff) | |
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/VictoryRoad3F.asm')
| -rwxr-xr-x | data/maps/objects/VictoryRoad3F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index f5eeae79..ad4bd29f 100755 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -10,12 +10,12 @@ VictoryRoad3F_Object: db 0 ; signs db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE - object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION + object SPRITE_COOLTRAINER_M, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object SPRITE_COOLTRAINER_M, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object SPRITE_POKE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE + object SPRITE_POKE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person |