diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-06 11:52:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 11:52:24 -0400 |
| commit | 122d715484b79aba71d79caf148bac4a2ec441a5 (patch) | |
| tree | a13bdf621fa8d3f3836ecb6e8d3a269ccc5d61cc /data/maps/objects/PokemonMansionB1F.asm | |
| parent | Merge pull request #259 from Rangi42/master (diff) | |
| parent | Avoid repeating the NUM_TMS value (diff) | |
| download | pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.tar.gz pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.tar.xz pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.zip | |
Merge pull request #261 from Rangi42/master
Port pokecrystal's base data and tmhm structure
Diffstat (limited to 'data/maps/objects/PokemonMansionB1F.asm')
| -rwxr-xr-x | data/maps/objects/PokemonMansionB1F.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index ac232799..1a6d6f32 100755 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -11,8 +11,8 @@ PokemonMansionB1F_Object: object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE - object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 - object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 + object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD + object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY |