Update bg1npc.tp2

start macro conversion and cleanup