diff --git a/asm/overlay_04.s b/asm/overlay_04.s index 65e799cb..74a35772 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -345,7 +345,11 @@ _0233CE0C: _0233CE28: bl ov04_0233CAC8 cmp r0, #0 +#ifdef EUROPE + moveq r0, #0x37c0 +#else ldreq r0, _0233D174 ; =0x000037BE +#endif ldrne r0, _0233D178 ; =0x000037BD mov r0, r0, lsl #0x10 mov r4, r0, lsr #0x10 @@ -563,25 +567,32 @@ _0233D14C: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 +#ifdef EUROPE +#define OV04_0233CDE4_OFFSET 2 +#else +#define OV04_0233CDE4_OFFSET 0 +#endif _0233D154: .word ov04_0233F670 _0233D158: .word 0x00001001 _0233D15C: .word 0x00002002 _0233D160: .word 0x00003001 _0233D164: .word ov04_0233F5BC _0233D168: .word ov04_0233F5B8 -_0233D16C: .word 0x000037B9 +_0233D16C: .word 0x000037B9 + OV04_0233CDE4_OFFSET _0233D170: .word 0x00000233 +#ifndef EUROPE _0233D174: .word 0x000037BE -_0233D178: .word 0x000037BD +#endif +_0233D178: .word 0x000037BD + OV04_0233CDE4_OFFSET _0233D17C: .word ov04_0233F59C _0233D180: .word ov04_0233F598 -_0233D184: .word 0x000037BF +_0233D184: .word 0x000037BF + OV04_0233CDE4_OFFSET _0233D188: .word 0x00001002 -_0233D18C: .word 0x000037D6 +_0233D18C: .word 0x000037D6 + OV04_0233CDE4_OFFSET _0233D190: .word 0x00002001 _0233D194: .word ov04_0233F584 _0233D198: .word ov04_0233F580 -_0233D19C: .word 0x000037D7 +_0233D19C: .word 0x000037D7 + OV04_0233CDE4_OFFSET arm_func_end ov04_0233CDE4 arm_func_start ov04_0233D1A0 @@ -970,8 +981,13 @@ _0233D648: bl CountNbOfItemsInStorage sub r0, r5, r0 str r0, [sp, #0x110] +#ifdef EUROPE + ldr r1, _0233EA08 ; =0x000037C2 + mov r0, #0x1c +#else mov r0, #0x1c mov r1, #0x37c0 +#endif add r2, sp, #0xec bl ov04_02046BE8 mov r0, #2 @@ -1129,10 +1145,6 @@ _0233D954: _0233D95C: mov r0, #3 bl ov01_02337648 - arm_func_end ov04_0233D2F8 - - arm_func_start ov04_0233D964 -ov04_0233D964: ; 0x0233D964 ldr r1, _0233E294 ; =ov04_0233F5DC add r3, r4, #0x84 ldr r2, [r1, r0, lsl #3] @@ -1383,7 +1395,11 @@ _0233DCCC: ldrsh r2, [sp, #0x12] ldrh r1, [sp, #0x14] add r5, sp, #0x9c +#ifdef EUROPE + add r0, r2, #0xd3 +#else add r0, r2, #0xd1 +#endif add r0, r0, #0x2900 mov r0, r0, lsl #0x10 str r2, [sp, #0xac] @@ -1749,18 +1765,26 @@ _0233E23C: bl ov01_0232B5D0 b _0233E304 .align 2, 0 +#ifdef EUROPE +#define OV04_0233D2F8_OFFSET 2 +#else +#define OV04_0233D2F8_OFFSET 0 +#endif _0233E25C: .word ov04_0233F644 _0233E260: .word 0x00002020 _0233E264: .word 0x00001001 _0233E268: .word 0x00005001 _0233E26C: .word 0x00003002 _0233E270: .word ov04_0233EF8C -_0233E274: .word 0x000037C1 +_0233E274: .word 0x000037C1 + OV04_0233D2F8_OFFSET _0233E278: .word ov01_02337B68 -_0233E27C: .word 0x000037C2 +_0233E27C: .word 0x000037C2 + OV04_0233D2F8_OFFSET _0233E280: .word 0x00001776 _0233E284: .word ov04_0233F0A8 _0233E288: .word ov04_0233F0E0 +#ifdef EUROPE +_0233EA08: .word 0x000037C2 +#endif _0233E28C: .word ov01_0233C1DC _0233E290: .word 0x00001002 _0233E294: .word ov04_0233F5DC @@ -1778,13 +1802,13 @@ _0233E2C0: .word 0x00001007 _0233E2C4: .word 0x00002001 _0233E2C8: .word 0x00001772 _0233E2CC: .word 0x00002011 -_0233E2D0: .word 0x000038C9 +_0233E2D0: .word 0x000038C9 + OV04_0233D2F8_OFFSET _0233E2D4: .word ov04_0233F5F8 -_0233E2D8: .word 0x000037CC -_0233E2DC: .word 0x000037CE -_0233E2E0: .word 0x000037D3 -_0233E2E4: .word 0x000037D2 -_0233E2E8: .word 0x000037D1 +_0233E2D8: .word 0x000037CC + OV04_0233D2F8_OFFSET +_0233E2DC: .word 0x000037CE + OV04_0233D2F8_OFFSET +_0233E2E0: .word 0x000037D3 + OV04_0233D2F8_OFFSET +_0233E2E4: .word 0x000037D2 + OV04_0233D2F8_OFFSET +_0233E2E8: .word 0x000037D1 + OV04_0233D2F8_OFFSET _0233E2EC: .word 0x00005008 _0233E2F0: .word ov04_0233EF28 _0233E2F4: .word ov04_0233EF54 @@ -2643,7 +2667,7 @@ _0233EF18: .word 0x00005006 _0233EF1C: .word 0x000037DA _0233EF20: .word 0x00005004 _0233EF24: .word 0x00005007 - arm_func_end ov04_0233D964 + arm_func_end ov04_0233D2F8 arm_func_start ov04_0233EF28 ov04_0233EF28: ; 0x0233EF28 @@ -3134,39 +3158,44 @@ _0233F564: .word ov04_0233F644 .global ov04_0233F568 ov04_0233F568: - .byte 0xC7, 0x37, 0x00, 0x00 +#ifdef EUROPE +#define OV04_DATA_OFFSET 2 +#else +#define OV04_DATA_OFFSET 0 +#endif + .byte 0xC7 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov04_0233F56C ov04_0233F56C: - .byte 0x03, 0x00, 0x00, 0x00, 0xC8, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0xC8 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov04_0233F580 ov04_0233F580: - .byte 0xD8, 0x37, 0x00, 0x00 + .byte 0xD8 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov04_0233F584 ov04_0233F584: .byte 0x06, 0x00, 0x00, 0x00 - .byte 0xD9, 0x37, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0xD9 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov04_0233F598 ov04_0233F598: - .byte 0xBA, 0x37, 0x00, 0x00 + .byte 0xBA + OV04_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov04_0233F59C ov04_0233F59C: - .byte 0x03, 0x00, 0x00, 0x00, 0xBB, 0x37, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - .byte 0xBC, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x03, 0x00, 0x00, 0x00, 0xBB + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0xBC + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov04_0233F5B8 ov04_0233F5B8: - .byte 0xB6, 0x37, 0x00, 0x00 + .byte 0xB6 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov04_0233F5BC ov04_0233F5BC: - .byte 0x01, 0x00, 0x00, 0x00, 0xB7, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0xB8, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x01, 0x00, 0x00, 0x00, 0xB7 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0xB8 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov04_0233F5D8 ov04_0233F5D8: - .byte 0xC3, 0x37, 0x00, 0x00 + .byte 0xC3 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov04_0233F5DC ov04_0233F5DC: - .byte 0x03, 0x00, 0x00, 0x00, 0xC4, 0x37, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0xC5, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x03, 0x00, 0x00, 0x00, 0xC4 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + .byte 0xC5 + OV04_DATA_OFFSET, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov04_0233F5F8 ov04_0233F5F8: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00