Just some very minor things I'm pushing while I work on the stubborn Silph Gauntlet Guard.
- Fixed the misshapen Poke Ball and Pikachu sprites on the 3DS Border, and gave Shocks the updated grey palette.
- Moved a trainer in Rock Tunnel that was accidentally made optional.
- Fixed some wording in Gavillain's dex entry
- Made wild encounters in Rock Tunnel have more consistent levels.
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id