Battle Event: Locke and the Merchant/Officer

In hindsight, the solution should have been obvious.

Rydel's patches to change how sprites and palettes work included moving this data. That's why this already fixed bug broke again and none of my attempts to fix it were doing anything - I'm changing the wrong data, it's been duplicated and moved somewhere else.

Putting this here as much for my own reminder as anything - the coding Everything listed starting at C1/3E06 is now at FE/FFA1. The D0 12 at C1/3E0B I had to blank is at FE/FFA6. Changed the D0 to 80, Locke is using the default soldier battle palette (read: the proper one).

Thank you to B-Run and Gi for their help in figuring this out.