Battle Event: Locke and the Merchant/Officer

You may have already done this, but keep in mind Overworld palette 6 is something totally different from battle palette 6, which is Esper Terra's palette. If you are running with a debugger, do a breakpoint here:

Code:

C1/3E20:    BF2BCEC2    LDA $C2CE2B,X    (Pull palette ID from table in C2 for sprite X)

then step once to see if its actually pulling the right palette ID.

Let me know what you get... we'll figure this out.