diff --git a/asm/overlay_05.s b/asm/overlay_05.s index e3381433..7fd15e25 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -694,25 +694,30 @@ _0233D33C: add sp, sp, #0x18c ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 +#ifdef EUROPE +#define OV05_0233CDE4_OFFSET 2 +#else +#define OV05_0233CDE4_OFFSET 0 +#endif _0233D344: .word ov05_0233FCCC _0233D348: .word 0x00002001 _0233D34C: .word 0x00001002 _0233D350: .word ov05_0233FBD8 _0233D354: .word ov05_0233FBD4 -_0233D358: .word 0x000037E1 +_0233D358: .word 0x000037E1 + OV05_0233CDE4_OFFSET _0233D35C: .word 0x00000233 -_0233D360: .word 0x000037E3 +_0233D360: .word 0x000037E3 + OV05_0233CDE4_OFFSET _0233D364: .word ov05_0233FB94 -_0233D368: .word 0x000037E2 +_0233D368: .word 0x000037E2 + OV05_0233CDE4_OFFSET _0233D36C: .word 0x00001001 -_0233D370: .word 0x000037E5 -_0233D374: .word 0x000037E4 +_0233D370: .word 0x000037E5 + OV05_0233CDE4_OFFSET +_0233D374: .word 0x000037E4 + OV05_0233CDE4_OFFSET _0233D378: .word ov05_0233FB68 _0233D37C: .word ov05_0233FB64 -_0233D380: .word 0x000037EC +_0233D380: .word 0x000037EC + OV05_0233CDE4_OFFSET _0233D384: .word 0x00002002 _0233D388: .word ov05_0233FBB4 -_0233D38C: .word 0x000037E9 +_0233D38C: .word 0x000037E9 + OV05_0233CDE4_OFFSET _0233D390: .word 0x00003001 _0233D394: .word 0x00004001 arm_func_end ov05_0233CDE4 @@ -1185,18 +1190,23 @@ _0233D9F4: add sp, sp, #0x17c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 +#ifdef EUROPE +#define OV05_0233D964_OFFSET 2 +#else +#define OV05_0233D964_OFFSET 0 +#endif _0233D9FC: .word ov05_0233FCA4 _0233DA00: .word 0x00001001 _0233DA04: .word 0x00005005 _0233DA08: .word ov05_0233DA2C _0233DA0C: .word ov01_02337B68 -_0233DA10: .word 0x000038C9 -_0233DA14: .word 0x000037ED -_0233DA18: .word 0x000037EE +_0233DA10: .word 0x000038C9 + OV05_0233D964_OFFSET +_0233DA14: .word 0x000037ED + OV05_0233D964_OFFSET +_0233DA18: .word 0x000037EE + OV05_0233D964_OFFSET _0233DA1C: .word 0x00005004 _0233DA20: .word 0x0000023B _0233DA24: .word 0x00000239 -_0233DA28: .word 0x000037EF +_0233DA28: .word 0x000037EF + OV05_0233D964_OFFSET arm_func_end ov05_0233D964 arm_func_start ov05_0233DA2C @@ -2376,6 +2386,11 @@ _0233EAAC: str r1, [r0] b _0233F854 .align 2, 0 +#ifdef EUROPE +#define OV05_0233DBA0_OFFSET 2 +#else +#define OV05_0233DBA0_OFFSET 0 +#endif _0233EB00: .word ov05_0233FCA8 _0233EB04: .word 0x00003023 _0233EB08: .word 0x00002001 @@ -2385,20 +2400,20 @@ _0233EB14: .word 0x00004002 _0233EB18: .word 0x00009011 _0233EB1C: .word ov05_0233FC18 _0233EB20: .word ov05_0233FC14 -_0233EB24: .word 0x000037F0 +_0233EB24: .word 0x000037F0 + OV05_0233DBA0_OFFSET _0233EB28: .word 0x00000233 _0233EB2C: .word 0x00002710 _0233EB30: .word 0x05F5E100 _0233EB34: .word ov05_0233FB80 _0233EB38: .word ov05_0233FB7C -_0233EB3C: .word 0x00003801 +_0233EB3C: .word 0x00003801 + OV05_0233DBA0_OFFSET _0233EB40: .word ov05_0233FBF8 _0233EB44: .word ov05_0233FBF4 -_0233EB48: .word 0x00003802 +_0233EB48: .word 0x00003802 + OV05_0233DBA0_OFFSET _0233EB4C: .word 0xD4A51000 -_0233EB50: .word 0x000037F6 +_0233EB50: .word 0x000037F6 + OV05_0233DBA0_OFFSET _0233EB54: .word 0x00003002 -_0233EB58: .word 0x00003806 +_0233EB58: .word 0x00003806 + OV05_0233DBA0_OFFSET _0233EB5C: .word 0x0000300F _0233EB60: .word 0x00003003 _0233EB64: .word 0x00003004 @@ -2406,18 +2421,18 @@ _0233EB68: .word 0x00003010 _0233EB6C: .word 0x00003020 _0233EB70: .word 0x00003007 _0233EB74: .word ov05_0233FC44 -_0233EB78: .word 0x000037F9 +_0233EB78: .word 0x000037F9 + OV05_0233DBA0_OFFSET _0233EB7C: .word 0x00003021 _0233EB80: .word 0x00003022 -_0233EB84: .word 0x000037FA +_0233EB84: .word 0x000037FA + OV05_0233DBA0_OFFSET _0233EB88: .word ov05_0233FC4C _0233EB8C: .word 0x00441C33 _0233EB90: .word ov05_0233F9C4 -_0233EB94: .word 0x000037FC +_0233EB94: .word 0x000037FC + OV05_0233DBA0_OFFSET _0233EB98: .word 0x00003028 _0233EB9C: .word ov05_0233FC5C _0233EBA0: .word ov05_0233FA74 -_0233EBA4: .word 0x000037FB +_0233EBA4: .word 0x000037FB + OV05_0233DBA0_OFFSET _0233EBA8: .word 0x00003024 _0233EBAC: .word 0x00003025 _0233EBB0: .word 0x00003026 @@ -2956,8 +2971,13 @@ _0233F35C: str r0, [sp] mov r0, #0 ldr r2, _0233F874 ; =ov05_0233FB4C +#ifdef EUROPE + mov r1, r0 + mov r3, #0x3800 +#else ldr r3, _0233F884 ; =0x000037FE mov r1, r0 +#endif bl ov05_0233CAC8 ldr r0, _0233EB00 ; =ov05_0233FCA8 ldr r1, _0233EB14 ; =0x00004002 @@ -3153,8 +3173,13 @@ _0233F630: bl ov05_0233CAA8 cmp r0, #1 bne _0233F664 +#ifdef EUROPE + ldr r1, _02340010 ; =0x00003802 + mov r0, #0x1c +#else mov r0, #0x1c mov r1, #0x3800 +#endif bl ov05_0233CB68 ldr r0, _0233EB00 ; =ov05_0233FCA8 mov r1, #0xf000 @@ -3301,22 +3326,32 @@ _0233F858: add sp, sp, #0x348 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233F860: .word 0x000037FD +#ifdef EUROPE +#define OV05_0233DBDC_OFFSET 2 +#else +#define OV05_0233DBDC_OFFSET 0 +#endif +_0233F860: .word 0x000037FD + OV05_0233DBDC_OFFSET _0233F864: .word 0x00002A30 _0233F868: .word 0x00003027 _0233F86C: .word 0x00003011 -_0233F870: .word 0x000037FF +_0233F870: .word 0x000037FF + OV05_0233DBDC_OFFSET _0233F874: .word ov05_0233FB4C -_0233F878: .word 0x000037F7 +_0233F878: .word 0x000037F7 + OV05_0233DBDC_OFFSET _0233F87C: .word 0x00004001 -_0233F880: .word 0x000037F8 +_0233F880: .word 0x000037F8 + OV05_0233DBDC_OFFSET +#ifndef EUROPE _0233F884: .word 0x000037FE +#endif _0233F888: .word 0x00008002 _0233F88C: .word 0x0000023B _0233F890: .word 0x00000239 -_0233F894: .word 0x00003803 -_0233F898: .word 0x00003804 -_0233F89C: .word 0x00003807 +#ifdef EUROPE +_02340010: .word 0x00003802 +#endif +_0233F894: .word 0x00003803 + OV05_0233DBDC_OFFSET +_0233F898: .word 0x00003804 + OV05_0233DBDC_OFFSET +_0233F89C: .word 0x00003807 + OV05_0233DBDC_OFFSET _0233F8A0: .word 0x00009010 _0233F8A4: .word 0x00001001 arm_func_end ov05_0233DBDC @@ -3361,7 +3396,11 @@ _0233F8DC: _0233F928: .word ov05_0233FCA8 _0233F92C: .word ov05_0233FC18 _0233F930: .word ov05_0233FC14 +#ifdef EUROPE +_0233F934: .word 0x000037F2 +#else _0233F934: .word 0x000037F0 +#endif _0233F938: .word 0x00000233 arm_func_end ov05_0233F8A8 @@ -3524,60 +3563,65 @@ _0233FB48: .word ov05_0233FC6C .global ov05_0233FB4C ov05_0233FB4C: - .byte 0xDB, 0x37, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0xDD, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 +#ifdef EUROPE +#define OV05_DATA_OFFSET 2 +#else +#define OV05_DATA_OFFSET 0 +#endif + .byte 0xDB + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0xDD + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FB64 ov05_0233FB64: - .byte 0xDB, 0x37, 0x00, 0x00 + .byte 0xDB + OV05_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov05_0233FB68 ov05_0233FB68: .byte 0x0B, 0x00, 0x00, 0x00 - .byte 0xDC, 0x37, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0xDC + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FB7C ov05_0233FB7C: - .byte 0xDB, 0x37, 0x00, 0x00 + .byte 0xDB + OV05_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov05_0233FB80 ov05_0233FB80: - .byte 0x0B, 0x00, 0x00, 0x00, 0xDC, 0x37, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x0B, 0x00, 0x00, 0x00, 0xDC + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FB94 ov05_0233FB94: - .byte 0xE7, 0x37, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0xE8, 0x37, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xE0, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 + .byte 0xE7 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .byte 0xE8 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xE0 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FBB4 ov05_0233FBB4: - .byte 0xEA, 0x37, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0xEB, 0x37, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xE0, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 + .byte 0xEA + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .byte 0xEB + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xE0 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FBD4 ov05_0233FBD4: - .byte 0xDE, 0x37, 0x00, 0x00 + .byte 0xDE + OV05_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov05_0233FBD8 ov05_0233FBD8: .byte 0x01, 0x00, 0x00, 0x00 - .byte 0xDF, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xE0, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 + .byte 0xDF + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xE0 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FBF4 ov05_0233FBF4: - .byte 0x03, 0x38, 0x00, 0x00 + .byte 0x03 + OV05_DATA_OFFSET, 0x38, 0x00, 0x00 .global ov05_0233FBF8 ov05_0233FBF8: .byte 0x06, 0x00, 0x00, 0x00 - .byte 0x04, 0x38, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x05, 0x38, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 + .byte 0x04 + OV05_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x05 + OV05_DATA_OFFSET, 0x38, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FC14 ov05_0233FC14: - .byte 0xF1, 0x37, 0x00, 0x00 + .byte 0xF1 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00 .global ov05_0233FC18 ov05_0233FC18: .byte 0x06, 0x00, 0x00, 0x00 - .byte 0xF2, 0x37, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xF3, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 - .byte 0xF4, 0x37, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xF5, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 + .byte 0xF2 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xF3 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .byte 0xF4 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xF5 + OV05_DATA_OFFSET, 0x37, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .global ov05_0233FC44 ov05_0233FC44: - .byte 0xF1, 0x37, 0xF2, 0x37, 0xF3, 0x37, 0xF3, 0x37 + .byte 0xF1 + OV05_DATA_OFFSET, 0x37, 0xF2 + OV05_DATA_OFFSET, 0x37, 0xF3 + OV05_DATA_OFFSET, 0x37, 0xF3 + OV05_DATA_OFFSET, 0x37 .global ov05_0233FC4C ov05_0233FC4C: .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x18, 0x11, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00