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/OaksLab.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/objects/OaksLab.asm') diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 676683b4..168595c0 100755 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -9,16 +9,16 @@ OaksLab_Object: db 11 ; objects object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 - object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person - object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person + object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person + object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person + object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person - object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person - object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person + object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person + object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person - object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person - object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person + object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person + object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person ; warp-to warp_to 4, 11, OAKS_LAB_WIDTH -- cgit v1.2.3 From 30ecbf6ea3a6cd2afc9191b2b7c49ca70e7e3777 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jul 2020 13:27:27 -0400 Subject: SONY -> RIVAL --- data/maps/objects/OaksLab.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/objects/OaksLab.asm') diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 168595c0..3e1a90c0 100755 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -8,7 +8,7 @@ OaksLab_Object: db 0 ; signs db 11 ; objects - object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1 object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person -- cgit v1.2.3