Regenerate prebuilt yaccage
Redraw EV after Elivilon Purification (8947)

EV can change in elyvilon_purification() when curing 'petrifying'
status. Mark it for redraw.

(cherry picked from commit 06a933df1f1c245203b019fc3db8e8f82bf46d65)
Don't destroy weapons when xom/wizmode weapon swap fails (#4606)

We were destroying the wrong copy of the player's item, eliminating
the one held by the player and leaving the other copy unlinked.

(cherry picked from commit 05d2e8748f62c67f67801a2d6c8349e51d5580ef)
Don't let Trog gift the Majin-Bo (Prism)

(cherry picked from commit 6355401968b9d0c03eb5c090c465b8e98f57cef0)

Conflicts:
	crawl-ref/source/acquire.cc