From 2454296d32b078123ecfc6434e43d0cb20e12c94 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jul 2020 12:48:15 -0400 Subject: Update sprite names These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible --- data/maps/objects/SSAnne2FRooms.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/objects/SSAnne2FRooms.asm') diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index ebb053a8..454b4c6b 100755 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -19,18 +19,18 @@ SSAnne2FRooms_Object: db 13 ; objects object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GRAMPS, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_POKE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_LITTLE_BOY, 11, 14, STAY, NONE, 11 ; person object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person + object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person ; warp-to warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F -- cgit v1.3.1-sl0p