aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/VictoryRoad1F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-19 23:04:16 -0400
committerGitHub <noreply@github.com>2020-07-19 23:04:16 -0400
commit0177688ad4d923c4970009fa87df48605bb43ed6 (patch)
tree4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/maps/objects/VictoryRoad1F.asm
parentMerge pull request #277 from Rangi42/master (diff)
parentMissingno's Pokédex weight is two bytes like the rest (diff)
downloadpokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz
pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz
pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/VictoryRoad1F.asm')
-rwxr-xr-xdata/maps/objects/VictoryRoad1F.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm
index 72fd1468..271be1b8 100755
--- a/data/maps/objects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -9,10 +9,10 @@ VictoryRoad1F_Object:
db 0 ; signs
db 7 ; objects
- object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
- object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
- object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK
- object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
+ object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
+ object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK
+ object SPRITE_POKE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person