aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonMart3F.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/CeladonMart3F.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/CeladonMart3F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMart3F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm
index 6dfce535..04a4c2f0 100755
--- a/data/maps/objects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -21,11 +21,11 @@ CeladonMart3F_Object:
sign 10, 1, 17 ; CeladonMart3Text17
db 5 ; objects
- object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person
- object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person
- object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person
- object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person
- object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person
+ object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person
+ object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person
+ object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person
+ object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person
; warp-to
warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F