aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SSAnneB1FRooms.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 12:48:15 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 12:48:15 -0400
commit2454296d32b078123ecfc6434e43d0cb20e12c94 (patch)
tree7d4b064c87d0d9b96d5f035fa8dab3cd8950fdb3 /data/maps/objects/SSAnneB1FRooms.asm
parent$c9 was "の" in Japanese (diff)
downloadpokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.tar.gz
pokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.tar.xz
pokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.zip
Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
Diffstat (limited to 'data/maps/objects/SSAnneB1FRooms.asm')
-rwxr-xr-xdata/maps/objects/SSAnneB1FRooms.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
index 5a03cafd..0f57dd6b 100755
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -21,12 +21,12 @@ SSAnneB1FRooms_Object:
object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
- object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
- object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
- object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
- object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
- object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_REST
- object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
+ object SPRITE_FISHER, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
+ object SPRITE_SUPER_NERD, 10, 13, STAY, RIGHT, 7 ; person
+ object SPRITE_MONSTER, 11, 12, STAY, NONE, 8 ; person
+ object SPRITE_POKE_BALL, 20, 2, STAY, NONE, 9, ETHER
+ object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST
+ object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
; warp-to
warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F