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/SSAnneB1FRooms.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/SSAnneB1FRooms.asm')
| -rwxr-xr-x | data/maps/objects/SSAnneB1FRooms.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 1d31b89c..5a03cafd 100755 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -25,7 +25,7 @@ SSAnneB1FRooms_Object: object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER - object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 + object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_REST object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION ; warp-to |