Battle Event: Locke and the Merchant/Officer

Of all things to come back to. Okay, Biggs and Wedge are now on Palette 1 as in vanilla, they're working fine. But I'm back to Locke using a mismatch of wrong colors in battle. He steals the uniform, it's palette 6. He's in the field, palette 6. Battle, nope. I undid my change to C1/3E0B as described above, made sure the old man at Sprite 23 is on the right palette, checked the hex values for Locke's sprite when he steals the clothes. All good. Compared my hex and palette set-ups to vanilla, they're fine there.

I found a workaround for it, but yeah, still problems.