More Pink Xan updates

Updating Pink Xan section to revert Xan portrait to default on all
platforms rather than using a copy of the default image.  Also changed
name of Pink Xan images to pinkxan[l/s].bmp to match spell name
pinkxan.spl.

Various updates to remove unnecessary THENs in PATCH_IF statements.
Updating bg1npc.tp2

Updating DECOMPILE_BSC_TO_BAF commands to DECOMPILE_AND_PATCH.