Logic updates

[jcallen]

• Dampé doesn't give a bottle in the 3DS version, instead it's at the swamp archery
• Update the logic around the Mystery Milk bottle -- ensure that the player can actually turn in the milk before assuming it can be used as an empty bottle

[Tacoman369]

Everything looks good to me except in Item_pool.cpp in the PlaceVanillaMainInventory function you have Empty_Bottle1 on the Beaver Race location when Empty_Bottle1 is defined as the ArcheryBottle not the BeaverRaceBottle. Just switch the two and its good to go in :)

[jcallen]

There was already an issue with confusing EMPTY_BOTTLE1 and EMPTY_BOTTLE2, I had just made it worse. I've force-pushed an updated branch that should be consistent everywhere (making the "earlier" archery one empty bottle 1 and the "later" beaver race one empty bottle 2 everywhere)