diff --git a/asm/include/overlay_06.inc b/asm/include/overlay_06.inc index 1559e447..b8a25691 100644 --- a/asm/include/overlay_06.inc +++ b/asm/include/overlay_06.inc @@ -7,8 +7,8 @@ .public GetKeyboardStatus .public GetKeyboardStringResult .public GetLanguageType -.public GetReleasedStylus .public GetMainTeamNameWithCheck +.public GetReleasedStylus .public MemAlloc .public MemcpySimple .public MemFree @@ -49,6 +49,7 @@ .public sub_02003BFC .public sub_02004F80 .public sub_02006C8C +.public sub_02020698_EU .public sub_02029F88 .public sub_02029FBC .public sub_02037468 diff --git a/asm/overlay_06.s b/asm/overlay_06.s index c0ce48d9..b08dc868 100644 --- a/asm/overlay_06.s +++ b/asm/overlay_06.s @@ -227,12 +227,17 @@ _0233CD34: add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 +#ifdef EUROPE +#define OV06_0233CB3C_OFFSET 2 +#else +#define OV06_0233CB3C_OFFSET 0 +#endif _0233CD3C: .word ov06_0233EEC0 _0233CD40: .word ov06_0233ED1C -_0233CD44: .word 0x000037A9 +_0233CD44: .word 0x000037A9 + OV06_0233CB3C_OFFSET _0233CD48: .word ov06_0233ED34 -_0233CD4C: .word 0x000037AC -_0233CD50: .word 0x000037AF +_0233CD4C: .word 0x000037AC + OV06_0233CB3C_OFFSET +_0233CD50: .word 0x000037AF + OV06_0233CB3C_OFFSET arm_func_end ov06_0233CB3C arm_func_start ov06_0233CD54 @@ -1367,20 +1372,25 @@ _0233DC6C: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 +#ifdef EUROPE +#define OV06_0233D5A4_OFFSET 2 +#else +#define OV06_0233D5A4_OFFSET 0 +#endif _0233DC74: .word ov06_0233EEEC _0233DC78: .word 0x00003001 _0233DC7C: .word ov06_0233ED68 _0233DC80: .word ov06_0233ED64 -_0233DC84: .word 0x00003787 +_0233DC84: .word 0x00003787 + OV06_0233D5A4_OFFSET _0233DC88: .word 0x00000233 -_0233DC8C: .word 0x0000378A +_0233DC8C: .word 0x0000378A + OV06_0233D5A4_OFFSET _0233DC90: .word ov06_0233ED84 -_0233DC94: .word 0x0000378B +_0233DC94: .word 0x0000378B + OV06_0233D5A4_OFFSET _0233DC98: .word 0x00001001 -_0233DC9C: .word 0x0000378F -_0233DCA0: .word 0x00003790 +_0233DC9C: .word 0x0000378F + OV06_0233D5A4_OFFSET +_0233DCA0: .word 0x00003790 + OV06_0233D5A4_OFFSET _0233DCA4: .word ov06_0233EDA4 -_0233DCA8: .word 0x00003794 +_0233DCA8: .word 0x00003794 + OV06_0233D5A4_OFFSET _0233DCAC: .word 0x00002001 _0233DCB0: .word 0x00004001 _0233DCB4: .word 0x00005001 @@ -1652,7 +1662,7 @@ _0233E034: ldr r0, [r7, #0xc] mov r0, r0, lsl #0x18 mov r0, r0, asr #0x18 - bl GetLanguageType + bl sub_02020698_EU cmp r0, #0 bne _0233E050 #else @@ -2290,11 +2300,12 @@ _0233E910: .word ov06_0233EE24 _0233E914: .word ov06_0233EE4C _0233E918: .word ov06_0233EE84 #ifdef EUROPE +_0233E920: .word 0x00002A30 _0233F0AC: .word 0x000037A5 #else _0233E91C: .word 0x000037A2 -#endif _0233E920: .word 0x00002A30 +#endif _0233E924: .word ov06_0233ED4C _0233E928: .word 0x000037A4 + OV06_0233DD7C_OFFSET _0233E92C: .word 0x000037A8 + OV06_0233DD7C_OFFSET