summaryrefslogtreecommitdiff
path: root/data/maps/objects/MtMoon1F.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/MtMoon1F.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/MtMoon1F.asm')
-rwxr-xr-xdata/maps/objects/MtMoon1F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm
index 16f931f4..b82ab9e0 100755
--- a/data/maps/objects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
@@ -13,18 +13,18 @@ MtMoon1F_Object:
db 13 ; objects
object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1
- object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
- object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
- object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
- object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
- object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
- object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
- object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION
- object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
- object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
- object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
- object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION
- object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN
+ object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
+ object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
+ object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
+ object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
+ object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
+ object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
+ object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION
+ object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
+ object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
+ object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
+ object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION
+ object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN
; warp-to
warp_to 14, 35, MT_MOON_1F_WIDTH