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/SilphCo5F.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/SilphCo5F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo5F.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index c10f17c8..86745b21 100755 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -18,7 +18,7 @@ SilphCo5F_Object: object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 - object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09 + object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person |