diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 2bcfde61..9ac87fd6 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -419,7 +419,11 @@ _0233CF74: .word ov03_02346BF0 _0233CF78: .word 0x00002001 _0233CF7C: .word ov03_02346A38 _0233CF80: .word ov03_02346A34 +#ifdef EUROPE +_0233CF84: .word 0x00003834 +#else _0233CF84: .word 0x00003832 +#endif _0233CF88: .word 0x00000233 _0233CF8C: .word 0x00001001 _0233CF90: .word 0x00003001 @@ -919,11 +923,19 @@ _0233D63C: .word 0x00000301 _0233D640: .word 0x0000FFFF _0233D644: .word ov03_02346930 _0233D648: .word ov03_0234692C +#ifdef EUROPE +_0233D64C: .word 0x0000383E +_0233D650: .word 0x00000233 +_0233D654: .word 0x0000384B +_0233D658: .word 0x0000384E +_0233D65C: .word 0x0000384F +#else _0233D64C: .word 0x0000383C _0233D650: .word 0x00000233 _0233D654: .word 0x00003849 _0233D658: .word 0x0000384C _0233D65C: .word 0x0000384D +#endif _0233D660: .word ov03_02346958 _0233D664: .word ov03_02346B20 _0233D668: .word ov03_02346954 @@ -1089,8 +1101,13 @@ _0233D844: str r1, [r0] b _0233DD44 _0233D894: +#ifdef EUROPE + mov r0, #0x1c + mov r1, #0x3880 +#else ldr r1, _0233DD70 ; =0x0000387E mov r0, #0x1c +#endif bl sub_02066468 ldr r0, _0233DD50 ; =ov03_02346BBC mov r1, #2 @@ -1433,19 +1450,26 @@ _0233DD48: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 +#ifdef EUROPE +#define OV03_0233D964_OFFSET 2 +#else +#define OV03_0233D964_OFFSET 0 +#endif _0233DD50: .word ov03_02346BBC _0233DD54: .word 0x00000101 _0233DD58: .word 0x00000401 _0233DD5C: .word ov03_02346908 _0233DD60: .word ov03_02346904 -_0233DD64: .word 0x00003837 +_0233DD64: .word 0x00003837 + OV03_0233D964_OFFSET _0233DD68: .word 0x00000233 _0233DD6C: .word ov03_0234674C +#ifndef EUROPE _0233DD70: .word 0x0000387E +#endif _0233DD74: .word 0x0000FFFF -_0233DD78: .word 0x0000384A -_0233DD7C: .word 0x0000384B -_0233DD80: .word 0x0000384E +_0233DD78: .word 0x0000384A + OV03_0233D964_OFFSET +_0233DD7C: .word 0x0000384B + OV03_0233D964_OFFSET +_0233DD80: .word 0x0000384E + OV03_0233D964_OFFSET _0233DD84: .word ov03_02346958 _0233DD88: .word ov03_02346B20 _0233DD8C: .word ov03_02346954 @@ -2039,9 +2063,15 @@ _0233E59C: str r4, [sp] bl sub_02037570 ldr r0, _0233EE08 ; =ov03_02346BC0 +#ifdef EUROPE + add r3, r4, #0x1f0 + ldr r2, [r0] + add r1, r3, #0x3580 +#else ldr r1, _0233EE4C ; =0x0000388F ldr r2, [r0] add r3, r4, #0x1f0 +#endif mov r0, #0 str r3, [r2] bl sub_02066468 @@ -2403,8 +2433,13 @@ _0233EABC: ; jump table b _0233ED28 ; case 9 b _0233ED5C ; case 10 _0233EAE8: +#ifdef EUROPE + ldr r1, _0233F5DC ; =0x00003882 + mov r0, #0x1c +#else mov r0, #0x1c mov r1, #0x3880 +#endif bl sub_02066468 ldr r0, _0233EE08 ; =ov03_02346BC0 mov r2, #0x324 @@ -2571,8 +2606,13 @@ _0233ED28: str r1, [r0] b _0233F2C4 _0233ED5C: +#ifdef EUROPE + ldr r1, _0233F604 ; =0x000038A6 + mov r0, #0x1c +#else mov r0, #0x1c rsb r1, r0, #0x38c0 +#endif bl sub_02066468 ldr r0, _0233EE08 ; =ov03_02346BC0 ldr r1, _0233EE88 ; =0x000003F6 @@ -2618,40 +2658,53 @@ _0233EDDC: strne r1, [r0] b _0233F2C4 .align 2, 0 +#ifdef EUROPE +#define OV03_0233DE58_OFFSET 2 +#else +#define OV03_0233DE58_OFFSET 0 +#endif _0233EE08: .word ov03_02346BC0 _0233EE0C: .word 0x000003F2 _0233EE10: .word 0x000003F1 _0233EE14: .word 0x00001001 -_0233EE18: .word 0x00003869 +_0233EE18: .word 0x00003869 + OV03_0233DE58_OFFSET _0233EE1C: .word 0x00000302 -_0233EE20: .word 0x0000384F -_0233EE24: .word 0x00003881 +_0233EE20: .word 0x0000384F + OV03_0233DE58_OFFSET +_0233EE24: .word 0x00003881 + OV03_0233DE58_OFFSET _0233EE28: .word ov03_023467EC -_0233EE2C: .word 0x00003850 +_0233EE2C: .word 0x00003850 + OV03_0233DE58_OFFSET _0233EE30: .word 0x00000303 -_0233EE34: .word 0x0000388D -_0233EE38: .word 0x0000386A -_0233EE3C: .word 0x0000388E +_0233EE34: .word 0x0000388D + OV03_0233DE58_OFFSET +_0233EE38: .word 0x0000386A + OV03_0233DE58_OFFSET +_0233EE3C: .word 0x0000388E + OV03_0233DE58_OFFSET _0233EE40: .word 0x00000121 -_0233EE44: .word 0x00003868 -_0233EE48: .word 0x0000386B +_0233EE44: .word 0x00003868 + OV03_0233DE58_OFFSET +_0233EE48: .word 0x0000386B + OV03_0233DE58_OFFSET +#ifndef EUROPE _0233EE4C: .word 0x0000388F +#endif _0233EE50: .word 0x00000312 _0233EE54: .word 0x00000321 _0233EE58: .word 0x00000323 _0233EE5C: .word ov03_02346A64 _0233EE60: .word ov03_02346A68 -_0233EE64: .word 0x00003853 -_0233EE68: .word 0x00003891 +#ifdef EUROPE +_0233F5DC: .word 0x00003882 +#endif +_0233EE64: .word 0x00003853 + OV03_0233DE58_OFFSET +_0233EE68: .word 0x00003891 + OV03_0233DE58_OFFSET _0233EE6C: .word ov03_023467D4 -_0233EE70: .word 0x000038A0 -_0233EE74: .word 0x000038A5 +_0233EE70: .word 0x000038A0 + OV03_0233DE58_OFFSET +_0233EE74: .word 0x000038A5 + OV03_0233DE58_OFFSET _0233EE78: .word 0x000003F3 -_0233EE7C: .word 0x000038A1 -_0233EE80: .word 0x000038A3 +_0233EE7C: .word 0x000038A1 + OV03_0233DE58_OFFSET +_0233EE80: .word 0x000038A3 + OV03_0233DE58_OFFSET _0233EE84: .word 0x000003F5 +#ifdef EUROPE +_0233F604: .word 0x000038A6 +#endif _0233EE88: .word 0x000003F6 -_0233EE8C: .word 0x00003851 +_0233EE8C: .word 0x00003851 + OV03_0233DE58_OFFSET _0233EE90: .word 0x00000355 _0233EE94: .word 0x00000325 _0233EE98: @@ -2963,14 +3016,14 @@ _0233F2DC: .word 0x00000402 _0233F2E0: .word 0x00000404 _0233F2E4: .word 0x00000239 _0233F2E8: .word 0x00000403 -_0233F2EC: .word 0x00003882 -_0233F2F0: .word 0x00003883 +_0233F2EC: .word 0x00003882 + OV03_0233DE58_OFFSET +_0233F2F0: .word 0x00003883 + OV03_0233DE58_OFFSET _0233F2F4: .word 0x0000032A -_0233F2F8: .word 0x00003857 +_0233F2F8: .word 0x00003857 + OV03_0233DE58_OFFSET _0233F2FC: .word ov03_0234678C -_0233F300: .word 0x000038A8 -_0233F304: .word 0x000038A9 -_0233F308: .word 0x000038AA +_0233F300: .word 0x000038A8 + OV03_0233DE58_OFFSET +_0233F304: .word 0x000038A9 + OV03_0233DE58_OFFSET +_0233F308: .word 0x000038AA + OV03_0233DE58_OFFSET _0233F30C: .word ov03_02346A6C arm_func_end ov03_0233DE58 @@ -4086,6 +4139,11 @@ _023402D8: str r1, [r0] b _023406AC .align 2, 0 +#ifdef EUROPE +#define OV03_0233F3A4_OFFSET 2 +#else +#define OV03_0233F3A4_OFFSET 0 +#endif _02340318: .word ov03_02346BC4 _0234031C: .word 0x00003070 _02340320: .word 0x00000603 @@ -4096,22 +4154,22 @@ _02340330: .word 0x0000A001 _02340334: .word ov03_023406DC _02340338: .word ov01_02337B68 _0234033C: .word ov03_023467EC -_02340340: .word 0x00003850 +_02340340: .word 0x00003850 + OV03_0233F3A4_OFFSET _02340344: .word 0x00001005 -_02340348: .word 0x000038C1 +_02340348: .word 0x000038C1 + OV03_0233F3A4_OFFSET _0234034C: .word ov03_023468A4 -_02340350: .word 0x000038C5 +_02340350: .word 0x000038C5 + OV03_0233F3A4_OFFSET _02340354: .word ov03_023468C4 _02340358: .word 0x00000501 -_0234035C: .word 0x000038C9 -_02340360: .word 0x0000387F -_02340364: .word 0x0000385D -_02340368: .word 0x00003854 -_0234036C: .word 0x0000386C -_02340370: .word 0x00003892 -_02340374: .word 0x0000389B +_0234035C: .word 0x000038C9 + OV03_0233F3A4_OFFSET +_02340360: .word 0x0000387F + OV03_0233F3A4_OFFSET +_02340364: .word 0x0000385D + OV03_0233F3A4_OFFSET +_02340368: .word 0x00003854 + OV03_0233F3A4_OFFSET +_0234036C: .word 0x0000386C + OV03_0233F3A4_OFFSET +_02340370: .word 0x00003892 + OV03_0233F3A4_OFFSET +_02340374: .word 0x0000389B + OV03_0233F3A4_OFFSET _02340378: .word ov03_02346A84 -_0234037C: .word 0x000038A6 +_0234037C: .word 0x000038A6 + OV03_0233F3A4_OFFSET _02340380: .word 0x00003071 _02340384: .word 0x00003072 _02340388: @@ -4340,15 +4398,15 @@ _023406B0: add sp, sp, #0xf4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023406B8: .word 0x00003851 -_023406BC: .word 0x00003852 +_023406B8: .word 0x00003851 + OV03_0233F3A4_OFFSET +_023406BC: .word 0x00003852 + OV03_0233F3A4_OFFSET _023406C0: .word 0x00000604 _023406C4: .word 0x00000605 _023406C8: .word 0x00000606 -_023406CC: .word 0x00003882 -_023406D0: .word 0x00003883 +_023406CC: .word 0x00003882 + OV03_0233F3A4_OFFSET +_023406D0: .word 0x00003883 + OV03_0233F3A4_OFFSET _023406D4: .word 0x00000609 -_023406D8: .word 0x00003857 +_023406D8: .word 0x00003857 + OV03_0233F3A4_OFFSET arm_func_end ov03_0233F3A4 arm_func_start ov03_023406DC @@ -5341,8 +5399,13 @@ _02341478: bl sub_0205B6CC cmp r0, #0 bne _023414B4 +#ifdef EUROPE + ldr r1, _023424E0 ; =0x0000389E + mov r0, #0x1c +#else mov r0, #0x1c add r1, r0, #0x3880 +#endif bl sub_02066468 mov r0, r4 ldr r1, _02341D20 ; =0x00007001 @@ -5929,6 +5992,11 @@ _02341CBC: str r1, [r0] b _02344184 .align 2, 0 +#ifdef EUROPE +#define OV03_02340DB4_OFFSET 2 +#else +#define OV03_02340DB4_OFFSET 0 +#endif _02341D00: .word ov03_02346BC8 _02341D04: .word 0x00005011 _02341D08: .word 0x00004002 @@ -5940,41 +6008,44 @@ _02341D1C: .word 0x0000511A _02341D20: .word 0x00007001 _02341D24: .word ov03_023469A8 _02341D28: .word ov03_023469A4 -_02341D2C: .word 0x00003879 +_02341D2C: .word 0x00003879 + OV03_02340DB4_OFFSET _02341D30: .word 0x00000233 -_02341D34: .word 0x00003858 +_02341D34: .word 0x00003858 + OV03_02340DB4_OFFSET _02341D38: .word 0x00004001 -_02341D3C: .word 0x00003859 -_02341D40: .word 0x00003895 -_02341D44: .word 0x00003896 +_02341D3C: .word 0x00003859 + OV03_02340DB4_OFFSET +_02341D40: .word 0x00003895 + OV03_02340DB4_OFFSET +_02341D44: .word 0x00003896 + OV03_02340DB4_OFFSET _02341D48: .word ov03_02346848 _02341D4C: .word ov03_02346844 -_02341D50: .word 0x0000385E -_02341D54: .word 0x0000386F -_02341D58: .word 0x00003870 +_02341D50: .word 0x0000385E + OV03_02340DB4_OFFSET +_02341D54: .word 0x0000386F + OV03_02340DB4_OFFSET +_02341D58: .word 0x00003870 + OV03_02340DB4_OFFSET _02341D5C: .word 0x00001004 -_02341D60: .word 0x0000389D -_02341D64: .word 0x00003860 +#ifdef EUROPE +_023424E0: .word 0x0000389E +#endif +_02341D60: .word 0x0000389D + OV03_02340DB4_OFFSET +_02341D64: .word 0x00003860 + OV03_02340DB4_OFFSET _02341D68: .word ov03_0234675C -_02341D6C: .word 0x00003861 +_02341D6C: .word 0x00003861 + OV03_02340DB4_OFFSET _02341D70: .word 0x00001002 -_02341D74: .word 0x00003863 -_02341D78: .word 0x00003864 +_02341D74: .word 0x00003863 + OV03_02340DB4_OFFSET +_02341D78: .word 0x00003864 + OV03_02340DB4_OFFSET _02341D7C: .word 0x00001005 -_02341D80: .word 0x00003865 +_02341D80: .word 0x00003865 + OV03_02340DB4_OFFSET _02341D84: .word 0x00001003 _02341D88: .word ov03_02346A90 -_02341D8C: .word 0x000038A6 +_02341D8C: .word 0x000038A6 + OV03_02340DB4_OFFSET _02341D90: .word 0x00003071 _02341D94: .word 0x00003072 _02341D98: .word 0x00003073 -_02341D9C: .word 0x00003866 +_02341D9C: .word 0x00003866 + OV03_02340DB4_OFFSET _02341DA0: .word 0x00004003 -_02341DA4: .word 0x00003873 -_02341DA8: .word 0x0000389E -_02341DAC: .word 0x00003884 -_02341DB0: .word 0x0000385A -_02341DB4: .word 0x00003897 +_02341DA4: .word 0x00003873 + OV03_02340DB4_OFFSET +_02341DA8: .word 0x0000389E + OV03_02340DB4_OFFSET +_02341DAC: .word 0x00003884 + OV03_02340DB4_OFFSET +_02341DB0: .word 0x0000385A + OV03_02340DB4_OFFSET +_02341DB4: .word 0x00003897 + OV03_02340DB4_OFFSET _02341DB8: .word 0x00004008 _02341DBC: .word 0x00004004 _02341DC0: .word 0x00004006 @@ -7198,33 +7269,33 @@ _02342F44: _02342F70: .word 0x00005108 _02342F74: .word 0x00005052 _02342F78: .word 0x00004005 -_02342F7C: .word 0x000038C9 -_02342F80: .word 0x00003855 +_02342F7C: .word 0x000038C9 + OV03_02340DB4_OFFSET +_02342F80: .word 0x00003855 + OV03_02340DB4_OFFSET _02342F84: .word 0x00002A30 _02342F88: .word 0x00004007 -_02342F8C: .word 0x00003856 -_02342F90: .word 0x00003893 -_02342F94: .word 0x00003894 +_02342F8C: .word 0x00003856 + OV03_02340DB4_OFFSET +_02342F90: .word 0x00003893 + OV03_02340DB4_OFFSET +_02342F94: .word 0x00003894 + OV03_02340DB4_OFFSET _02342F98: .word 0x00004010 -_02342F9C: .word 0x00003874 -_02342FA0: .word 0x00003876 -_02342FA4: .word 0x00003875 -_02342FA8: .word 0x0000389F -_02342FAC: .word 0x000038A1 -_02342FB0: .word 0x00003889 +_02342F9C: .word 0x00003874 + OV03_02340DB4_OFFSET +_02342FA0: .word 0x00003876 + OV03_02340DB4_OFFSET +_02342FA4: .word 0x00003875 + OV03_02340DB4_OFFSET +_02342FA8: .word 0x0000389F + OV03_02340DB4_OFFSET +_02342FAC: .word 0x000038A1 + OV03_02340DB4_OFFSET +_02342FB0: .word 0x00003889 + OV03_02340DB4_OFFSET _02342FB4: .word 0x00005110 _02342FB8: .word ov03_02346774 -_02342FBC: .word 0x00003887 +_02342FBC: .word 0x00003887 + OV03_02340DB4_OFFSET _02342FC0: .word 0x00005008 -_02342FC4: .word 0x00003888 -_02342FC8: .word 0x00003886 +_02342FC4: .word 0x00003888 + OV03_02340DB4_OFFSET +_02342FC8: .word 0x00003886 + OV03_02340DB4_OFFSET _02342FCC: .word 0x00005016 _02342FD0: .word ov03_02346BC8 -_02342FD4: .word 0x00003851 +_02342FD4: .word 0x00003851 + OV03_02340DB4_OFFSET _02342FD8: .word 0x00006001 -_02342FDC: .word 0x00003852 +_02342FDC: .word 0x00003852 + OV03_02340DB4_OFFSET _02342FE0: .word 0x00006002 -_02342FE4: .word 0x00003890 +_02342FE4: .word 0x00003890 + OV03_02340DB4_OFFSET _02342FE8: .word 0x00006004 _02342FEC: .word 0x00004001 _02342FF0: @@ -7823,8 +7894,13 @@ _02343868: ldrsh r0, [r0, #0x64] cmp r1, r0 blt _02343918 +#ifdef EUROPE + mov r0, #0x1c + rsb r1, r0, #0x38c0 +#else ldr r1, _02343FB4 ; =0x000038A2 mov r0, #0x1c +#endif bl sub_02066468 ldr r1, _02342FD0 ; =ov03_02346BC8 ldr r3, _02342F84 ; =0x00002A30 @@ -7920,8 +7996,13 @@ _023439CC: ldrb r1, [r0, #0x9d5] cmp r1, #0 beq _02343A44 +#ifdef EUROPE + mov r0, #0x1c + rsb r1, r0, #0x38c0 +#else ldr r1, _02343FB4 ; =0x000038A2 mov r0, #0x1c +#endif bl sub_02066468 ldr r1, _02342FD0 ; =ov03_02346BC8 ldr r3, _02342F84 ; =0x00002A30 @@ -8291,34 +8372,36 @@ _02343F44: _02343F70: .word 0xD4A51000 _02343F74: .word 0x00005006 _02343F78: .word ov03_02346BCC -_02343F7C: .word 0x00003885 +_02343F7C: .word 0x00003885 + OV03_02340DB4_OFFSET _02343F80: .word 0x00005053 _02343F84: .word 0x00004008 _02343F88: .word 0x00005003 _02343F8C: .word 0x00005004 _02343F90: .word ov03_0234675C -_02343F94: .word 0x000038A7 +_02343F94: .word 0x000038A7 + OV03_02340DB4_OFFSET _02343F98: .word 0x00005010 _02343F9C: .word 0x00005011 _02343FA0: .word 0x00005007 _02343FA4: .word 0x00005109 -_02343FA8: .word 0x0000388A +_02343FA8: .word 0x0000388A + OV03_02340DB4_OFFSET _02343FAC: .word 0x00005112 _02343FB0: .word 0x0000511A +#ifndef EUROPE _02343FB4: .word 0x000038A2 +#endif _02343FB8: .word 0x00005013 -_02343FBC: .word 0x0000388B -_02343FC0: .word 0x0000388C +_02343FBC: .word 0x0000388B + OV03_02340DB4_OFFSET +_02343FC0: .word 0x0000388C + OV03_02340DB4_OFFSET _02343FC4: .word 0x00008002 -_02343FC8: .word 0x00003882 -_02343FCC: .word 0x00003883 +_02343FC8: .word 0x00003882 + OV03_02340DB4_OFFSET +_02343FCC: .word 0x00003883 + OV03_02340DB4_OFFSET _02343FD0: .word 0x00007002 -_02343FD4: .word 0x00003857 -_02343FD8: .word 0x0000385F -_02343FDC: .word 0x00003862 +_02343FD4: .word 0x00003857 + OV03_02340DB4_OFFSET +_02343FD8: .word 0x0000385F + OV03_02340DB4_OFFSET +_02343FDC: .word 0x00003862 + OV03_02340DB4_OFFSET _02343FE0: .word 0x00002710 _02343FE4: .word 0x05F5E100 -_02343FE8: .word 0x00003867 +_02343FE8: .word 0x00003867 + OV03_02340DB4_OFFSET _02343FEC: .word 0x00006005 _02343FF0: .word ov03_02346BC8 _02343FF4: .word 0x00006006 @@ -8439,8 +8522,13 @@ _02344188: add sp, sp, #0x310 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 +#ifdef EUROPE +_02344190: .word 0x000038CB +_02344194: .word 0x00003892 +#else _02344190: .word 0x000038C9 _02344194: .word 0x00003890 +#endif _02344198: .word 0x00006004 _0234419C: .word 0x0000E001 arm_func_end ov03_02340DB4 @@ -8731,8 +8819,13 @@ _02344544: cmp r7, r6 blt _0234452C bl sub_02067664 +#ifdef EUROPE + mov r0, #0x1c + mov r1, #0x38c0 +#else ldr r1, _023446F0 ; =0x000038BE mov r0, #0x1c +#endif bl sub_02066468 mov r0, #4 str r0, [r4] @@ -8818,8 +8911,13 @@ _02344674: str r0, [sp] mov r0, #0 ldr r2, _023446FC ; =ov03_023467A4 +#ifdef EUROPE + ldr r3, _02344E7C ; =0x000038C2 + mov r1, r0 +#else mov r1, r0 mov r3, #0x38c0 +#endif bl sub_020663C8 mov r0, #0xb str r0, [r4] @@ -8847,11 +8945,18 @@ _023446E0: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 _023446E8: .word ov03_02346BD4 +#ifdef EUROPE +_023446EC: .word 0x000038BF +#else _023446EC: .word 0x000038BD _023446F0: .word 0x000038BE +#endif _023446F4: .word 0x0000023B _023446F8: .word 0x00000239 _023446FC: .word ov03_023467A4 +#ifdef EUROPE +_02344E7C: .word 0x000038C2 +#endif arm_func_end ov03_02344464 arm_func_start ov03_02344700 @@ -8983,8 +9088,13 @@ _023448A0: str r0, [sp, #0x14] ldr r0, [r4, #8] mov r1, #0xa +#ifdef EUROPE + add r0, r0, #0x52 + add r0, r0, #0x3c00 +#else add r0, r0, #0xc50 add r0, r0, #0x3000 +#endif strh r0, [sp, #0x10] ldr r0, [r4, #8] mov ip, #1 @@ -9021,7 +9131,11 @@ _0234492C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02344934: .word ov03_02346BD8 +#ifdef EUROPE +_02344938: .word 0x00003C51 +#else _02344938: .word 0x00003C4F +#endif _0234493C: .word ov03_02346AAC _02344940: .word 0x00041833 _02344944: .word ov03_02344954 @@ -9032,8 +9146,13 @@ _02344950: .word ov03_02344970 arm_func_start ov03_02344954 ov03_02344954: ; 0x02344954 +#ifdef EUROPE + add r0, r1, #0x52 + add r0, r0, #0x3c00 +#else add r0, r1, #0xc50 add r0, r0, #0x3000 +#endif mov r0, r0, lsl #0x10 ldr ip, _0234496C ; =StringFromMessageId mov r0, r0, lsr #0x10 @@ -9048,14 +9167,24 @@ ov03_02344970: ; 0x02344970 mov r4, r0 bl sub_02030A18 mov r5, r0 +#ifdef EUROPE + add r0, r5, #0x52 + add r0, r0, #0x3c00 +#else add r0, r5, #0xc50 add r0, r0, #0x3000 +#endif mov r1, r0, lsl #0x10 mov r0, r4 mov r1, r1, lsr #0x10 bl sub_02030A2C +#ifdef EUROPE + add r0, r5, #0x5c + add r0, r0, #0x3c00 +#else add r0, r5, #0x5a add r0, r0, #0x3c00 +#endif mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl StringFromMessageId @@ -10232,6 +10361,11 @@ _023459F8: str r1, [r0] b _02346640 .align 2, 0 +#ifdef EUROPE +#define OV03_02344AB8_OFFSET 2 +#else +#define OV03_02344AB8_OFFSET 0 +#endif _02345A5C: .word ov03_02346BDC _02345A60: .word 0x00003032 _02345A64: .word 0x00002010 @@ -10239,36 +10373,36 @@ _02345A68: .word 0x00001005 _02345A6C: .word 0x00003536 _02345A70: .word 0x00003701 _02345A74: .word ov03_02346864 -_02345A78: .word 0x0000385B -_02345A7C: .word 0x0000385C +_02345A78: .word 0x0000385B + OV03_02344AB8_OFFSET +_02345A7C: .word 0x0000385C + OV03_02344AB8_OFFSET _02345A80: .word ov03_02346804 -_02345A84: .word 0x00003846 -_02345A88: .word 0x00003872 +_02345A84: .word 0x00003846 + OV03_02344AB8_OFFSET +_02345A88: .word 0x00003872 + OV03_02344AB8_OFFSET _02345A8C: .word ov03_02346A04 -_02345A90: .word 0x00003848 -_02345A94: .word 0x0000386E -_02345A98: .word 0x00003871 +_02345A90: .word 0x00003848 + OV03_02344AB8_OFFSET +_02345A94: .word 0x0000386E + OV03_02344AB8_OFFSET +_02345A98: .word 0x00003871 + OV03_02344AB8_OFFSET _02345A9C: .word 0x00000233 _02345AA0: .word ov03_02346884 -_02345AA4: .word 0x0000389A +_02345AA4: .word 0x0000389A + OV03_02344AB8_OFFSET _02345AA8: .word ov03_0234697C -_02345AAC: .word 0x00003898 -_02345AB0: .word 0x00003899 +_02345AAC: .word 0x00003898 + OV03_02344AB8_OFFSET +_02345AB0: .word 0x00003899 + OV03_02344AB8_OFFSET _02345AB4: .word ov03_02346824 -_02345AB8: .word 0x0000386D +_02345AB8: .word 0x0000386D + OV03_02344AB8_OFFSET _02345ABC: .word 0x00002002 _02345AC0: .word ov03_023467BC -_02345AC4: .word 0x000038AB +_02345AC4: .word 0x000038AB + OV03_02344AB8_OFFSET _02345AC8: .word 0x00003001 -_02345ACC: .word 0x000038AD +_02345ACC: .word 0x000038AD + OV03_02344AB8_OFFSET _02345AD0: .word ov03_02346ABC _02345AD4: .word ov03_023467C0 -_02345AD8: .word 0x000038B1 +_02345AD8: .word 0x000038B1 + OV03_02344AB8_OFFSET _02345ADC: .word 0x00003053 -_02345AE0: .word 0x000038AC -_02345AE4: .word 0x000038AE +_02345AE0: .word 0x000038AC + OV03_02344AB8_OFFSET +_02345AE4: .word 0x000038AE + OV03_02344AB8_OFFSET _02345AE8: .word 0x00003504 -_02345AEC: .word 0x000038B3 +_02345AEC: .word 0x000038B3 + OV03_02344AB8_OFFSET _02345AF0: .word 0x00003511 _02345AF4: .word 0x00003055 _02345AF8: .word 0x00002003 @@ -10276,7 +10410,7 @@ _02345AFC: .word 0x00001004 _02345B00: .word 0x00002004 _02345B04: .word 0x00002005 _02345B08: .word 0x00002011 -_02345B0C: .word 0x000038B4 +_02345B0C: .word 0x000038B4 + OV03_02344AB8_OFFSET _02345B10: .word 0x00003031 _02345B14: .word 0x00003033 _02345B18: .word ov01_0233C1B4 @@ -10322,7 +10456,11 @@ _02345B80: ldrsh r2, [sp, #0x18] ldrh r1, [sp, #0x1a] add r4, sp, #0x94 +#ifdef EUROPE + add r0, r2, #0xd3 +#else add r0, r2, #0xd1 +#endif add r0, r0, #0x2900 mov r0, r0, lsl #0x10 str r2, [sp, #0xa4] @@ -11069,7 +11207,11 @@ _0234664C: .word ov03_02346AC8 _02346650: .word 0x00001013 _02346654: .word 0x000008E4 _02346658: .word 0x00003101 +#ifdef EUROPE +_0234665C: .word 0x000038B4 +#else _0234665C: .word 0x000038B2 +#endif _02346660: .word 0x00003054 _02346664: .word 0x0000023B _02346668: .word 0x00000239 @@ -11150,140 +11292,145 @@ ov03_0234674C: .byte 0x00, 0x00, 0x00, 0x00 .global ov03_0234675C ov03_0234675C: - .byte 0x29, 0x38, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x2A, 0x38, 0x00, 0x00 +#ifdef EUROPE +#define OV03_DATA_OFFSET 2 +#else +#define OV03_DATA_OFFSET 0 +#endif + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x2A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346774 ov03_02346774: - .byte 0x29, 0x38, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF .global ov03_0234678C ov03_0234678C: - .byte 0x29, 0x38, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x2B, 0x38, 0x00, 0x00 + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x2B + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023467A4 ov03_023467A4: - .byte 0x29, 0x38, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x2A, 0x38, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x2A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023467BC ov03_023467BC: - .byte 0x29, 0x38, 0x00, 0x00 + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_023467C0 ov03_023467C0: - .byte 0x1D, 0x00, 0x00, 0x00, 0x2A, 0x38, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x2A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023467D4 ov03_023467D4: - .byte 0x29, 0x38, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x2B, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x2B + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023467EC ov03_023467EC: - .byte 0x29, 0x38, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x2A, 0x38, 0x00, 0x00 + .byte 0x29 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x2A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346804 ov03_02346804: - .byte 0x45, 0x38, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x34, 0x38, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x45 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x10, 0x00, 0x00, 0x00, 0x34 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346824 ov03_02346824: - .byte 0x42, 0x38, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x43, 0x38, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x44, 0x38, 0x00, 0x00 + .byte 0x42 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x43 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x44 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346844 ov03_02346844: - .byte 0x5F, 0x38, 0x00, 0x00 + .byte 0x5F + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_02346848 ov03_02346848: - .byte 0x1D, 0x00, 0x00, 0x00, 0x62, 0x38, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x1D, 0x00, 0x00, 0x00, 0x62 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346864 ov03_02346864: - .byte 0x41, 0x38, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x41 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x0F, 0x00, 0x00, 0x00, 0x38 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346884 ov03_02346884: - .byte 0x45, 0x38, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x3A, 0x38, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x45 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x10, 0x00, 0x00, 0x00, 0x3A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023468A4 ov03_023468A4: - .byte 0xC2, 0x38, 0x00, 0x00 - .byte 0x1C, 0x00, 0x00, 0x00, 0xC3, 0x38, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0xC4, 0x38, 0x00, 0x00 + .byte 0xC2 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x1C, 0x00, 0x00, 0x00, 0xC3 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0xC4 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023468C4 ov03_023468C4: - .byte 0xC6, 0x38, 0x00, 0x00 - .byte 0x1C, 0x00, 0x00, 0x00, 0xC7, 0x38, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0xC8, 0x38, 0x00, 0x00 + .byte 0xC6 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x1C, 0x00, 0x00, 0x00, 0xC7 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0xC8 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023468E4 ov03_023468E4: - .byte 0xB5, 0x38, 0x00, 0x00 + .byte 0xB5 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_023468E8 ov03_023468E8: - .byte 0x10, 0x00, 0x00, 0x00, 0xB6, 0x38, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB7, 0x38, 0x00, 0x00 + .byte 0x10, 0x00, 0x00, 0x00, 0xB6 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB7 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346904 ov03_02346904: - .byte 0x33, 0x38, 0x00, 0x00 + .byte 0x33 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_02346908 ov03_02346908: - .byte 0x06, 0x00, 0x00, 0x00, 0x34, 0x38, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x35, 0x38, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x36, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x34 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x35 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00, 0x36 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF .global ov03_0234692C ov03_0234692C: - .byte 0x38, 0x38, 0x00, 0x00 + .byte 0x38 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_02346930 ov03_02346930: - .byte 0x09, 0x00, 0x00, 0x00, 0x39, 0x38, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x3A, 0x38, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x3B, 0x38, 0x00, 0x00 + .byte 0x09, 0x00, 0x00, 0x00, 0x39 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00, 0x3A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x3B + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346954 ov03_02346954: - .byte 0x3D, 0x38, 0x00, 0x00 + .byte 0x3D + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_02346958 ov03_02346958: - .byte 0x0C, 0x00, 0x00, 0x00, 0x3E, 0x38, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x3F, 0x38, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x40, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0C, 0x00, 0x00, 0x00, 0x3E + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x3F + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x0E, 0x00, 0x00, 0x00, 0x40 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF .global ov03_0234697C ov03_0234697C: - .byte 0x41, 0x38, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x45, 0x38, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x3A, 0x38, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x41 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x45 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x10, 0x00, 0x00, 0x00, 0x3A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023469A4 ov03_023469A4: - .byte 0x7A, 0x38, 0x00, 0x00 + .byte 0x7A + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_023469A8 ov03_023469A8: - .byte 0x17, 0x00, 0x00, 0x00, 0x7B, 0x38, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x7C, 0x38, 0x00, 0x00 - .byte 0x19, 0x00, 0x00, 0x00, 0x7D, 0x38, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x17, 0x00, 0x00, 0x00, 0x7B + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x7C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x19, 0x00, 0x00, 0x00, 0x7D + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_023469D4 ov03_023469D4: - .byte 0xB8, 0x38, 0x00, 0x00 + .byte 0xB8 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_023469D8 ov03_023469D8: - .byte 0x12, 0x00, 0x00, 0x00, 0xB9, 0x38, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xBA, 0x38, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0xBB, 0x38, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xBC, 0x38, 0x00, 0x00 + .byte 0x12, 0x00, 0x00, 0x00, 0xB9 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xBA + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x15, 0x00, 0x00, 0x00, 0xBB + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0xBC + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346A04 ov03_02346A04: - .byte 0x41, 0x38, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x45, 0x38, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x47, 0x38, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x34, 0x38, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x2C, 0x38, 0x00, 0x00 + .byte 0x41 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x0F, 0x00, 0x00, 0x00, 0x45 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x47 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x12, 0x00, 0x00, 0x00, 0x34 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x2C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346A34 ov03_02346A34: - .byte 0x2D, 0x38, 0x00, 0x00 + .byte 0x2D + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_02346A38 ov03_02346A38: - .byte 0x01, 0x00, 0x00, 0x00, 0x2E, 0x38, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2F, 0x38, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x30, 0x38, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31, 0x38, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x2E + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2F + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x30 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x31 + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov03_02346A64 ov03_02346A64: @@ -11360,7 +11507,7 @@ ov03_02346BC8: .byte 0x00, 0x00, 0x00, 0x00 .global ov03_02346BCC ov03_02346BCC: - .byte 0x7A, 0x38, 0x7B, 0x38, 0x7C, 0x38, 0x00, 0x00 + .byte 0x7A + OV03_DATA_OFFSET, 0x38, 0x7B + OV03_DATA_OFFSET, 0x38, 0x7C + OV03_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov03_02346BD4 ov03_02346BD4: .byte 0x00, 0x00, 0x00, 0x00