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/SilphCo10F.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/SilphCo10F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo10F.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 1c8948d3..0bea3a43 100755 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -15,7 +15,7 @@ SilphCo10F_Object: object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person - object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26 + object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS |