aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnne2F.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/SSAnne2F.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/SSAnne2F.asm')
-rwxr-xr-xdata/maps/objects/SSAnne2F.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index 6abd5ac4..9a08b781 100755
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -16,7 +16,7 @@ SSAnne2F_Object:
db 2 ; objects
object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
- object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
+ object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1
; warp-to
warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS