diff --git a/asm/overlay_28.s b/asm/overlay_28.s index 1c331ec9..922470d1 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -306,7 +306,11 @@ _0238A54C: strb r2, [r1, #8] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 +#ifdef EUROPE +_0238A578: .word 0x00003D58 +#else _0238A578: .word 0x00003618 +#endif _0238A57C: .word ov28_0238AD80 _0238A580: .word ov28_0238ADA0 _0238A584: .word ov28_0238AD24 @@ -861,16 +865,25 @@ ov28_0238AD0C: .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00 .global ov28_0238AD24 ov28_0238AD24: - .byte 0xBF, 0x44, 0x00, 0x00 +#ifdef EUROPE +#define OV28_DATA_OFFSET_1 2 +#define OV28_DATA_OFFSET_2 0x1F +#else +#define OV28_DATA_OFFSET_1 0 +#define OV28_DATA_OFFSET_2 0 +#endif + .byte 0xBF + OV28_DATA_OFFSET_1, 0x44, 0x00, 0x00 .global ov28_0238AD28 ov28_0238AD28: - .byte 0xC0, 0x44, 0x00, 0x00 + .byte 0xC0 + OV28_DATA_OFFSET_1, 0x44, 0x00, 0x00 .global ov28_0238AD2C ov28_0238AD2C: - .byte 0x75, 0x45, 0x00, 0x00, 0x29, 0x46, 0x00, 0x00, 0x2A, 0x46, 0x00, 0x00, 0x84, 0x46, 0x00, 0x00 - .byte 0x99, 0x47, 0x00, 0x00, 0x9A, 0x47, 0x00, 0x00, 0x13, 0x48, 0x00, 0x00, 0x3D, 0x47, 0x00, 0x00 - .byte 0x3E, 0x47, 0x00, 0x00, 0x98, 0x47, 0x00, 0x00, 0x85, 0x46, 0x00, 0x00, 0x86, 0x46, 0x00, 0x00 - .byte 0xE0, 0x46, 0x00, 0x00, 0xE1, 0x46, 0x00, 0x00, 0xE2, 0x46, 0x00, 0x00, 0x3C, 0x47, 0x00, 0x00 + .byte 0x75 + OV28_DATA_OFFSET_2, 0x45, 0x00, 0x00, 0x29 + OV28_DATA_OFFSET_2, 0x46, 0x00, 0x00, 0x2A + OV28_DATA_OFFSET_2, 0x46, 0x00, 0x00, 0x84 + OV28_DATA_OFFSET_2, 0x46, 0x00, 0x00 + .byte 0x99 + OV28_DATA_OFFSET_2, 0x47, 0x00, 0x00, 0x9A + OV28_DATA_OFFSET_2, 0x47, 0x00, 0x00, 0x13 + OV28_DATA_OFFSET_2, 0x48, 0x00, 0x00, 0x3D + OV28_DATA_OFFSET_2, 0x47, 0x00, 0x00 + .byte 0x3E + OV28_DATA_OFFSET_2, 0x47, 0x00, 0x00, 0x98 + OV28_DATA_OFFSET_2, 0x47, 0x00, 0x00, 0x85 + OV28_DATA_OFFSET_2, 0x46, 0x00, 0x00, 0x86 + OV28_DATA_OFFSET_2, 0x46, 0x00, 0x00 + .byte 0xE0 + OV28_DATA_OFFSET_2, 0x46, 0x00, 0x00 + .word 0x46E1 + OV28_DATA_OFFSET_2, 0x46E2 + OV28_DATA_OFFSET_2 + .byte 0x3C + OV28_DATA_OFFSET_2, 0x47, 0x00, 0x00 .data .global ov28_0238AD80