Update rAthena-main-upgrade.sql

Added in the differences from some months ago. Very special thanks to @dastgirpojee for the autotrade saving script!

None of us could test with actual data, so feel free to try it and point out any flaws you can see.