summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route12.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/Route12.asm
parent452803af278648b92cc71af2f714b7689737b969 (diff)
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/Route12.asm')
-rwxr-xr-xdata/maps/objects/Route12.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm
index 6cce9529..212b05c8 100755
--- a/data/maps/objects/Route12.asm
+++ b/data/maps/objects/Route12.asm
@@ -13,15 +13,15 @@ Route12_Object:
db 10 ; objects
object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person
- object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
- object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
- object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
- object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
- object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
- object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
- object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY
- object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON
+ object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
+ object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4
+ object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
+ object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
+ object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
+ object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
+ object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
+ object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY
+ object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON
; warp-to
warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F