From 2453eb35efc489da93c21b727dfa59eb2045040f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 29 Dec 2023 22:38:12 -0600 Subject: [PATCH] Split overlay 11 ASM JP --- asm/overlay_11.s | 2198 +++++++++++++++++++++++++++++++++------------- 1 file changed, 1609 insertions(+), 589 deletions(-) diff --git a/asm/overlay_11.s b/asm/overlay_11.s index d179e2b8..b18a9f89 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -1408,7 +1408,7 @@ _022DD414: b _022DDD00 _022DD424: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam add r1, sp, #8 bl ov11_022E68E4 cmp r0, #0 @@ -1426,13 +1426,13 @@ _022DD424: b _022DDD00 _022DD468: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 str r5, [sp] mov r0, #2 @@ -1476,7 +1476,7 @@ _022DD50C: b _022DDD00 _022DD524: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F25A4 @@ -1485,7 +1485,7 @@ _022DD524: b _022DDD00 _022DD544: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mvn r1, #0 cmp r1, r0, asr #16 @@ -1610,16 +1610,16 @@ _022DD6D0: b _022DDD00 _022DD700: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #8] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, _022DDD18 ; =ov11_02324E80 mov r6, r0 strh r7, [r1, #6] @@ -1634,11 +1634,11 @@ _022DD700: _022DD758: mov r0, r8, lsl #0x10 mov r0, r0, lsr #0x10 - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r1, r6, lsl #0x10 str r0, [sp, #0xc] mov r0, r1, lsr #0x10 - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sp, #0x10] add r2, sp, #0xc mov r0, #0 @@ -1714,7 +1714,7 @@ _022DD860: _022DD880: ldrh r0, [r6, #2] add r8, r6, #2 - bl ScriptParamToInt + bl ProcessScriptParam ldrsh r1, [r4, #0x44] add r6, r6, #6 cmp r0, r1 @@ -1809,7 +1809,7 @@ _022DD990: cmp r7, #0xab addeq r6, r6, #2 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam ldrh r0, [r6, #4] ldr r2, [r4, #0x14] ldr r1, _022DDD54 ; =ov11_023193BC @@ -1965,7 +1965,7 @@ _022DDBE8: cmp r0, #1 bne _022DDC18 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam bl ov11_022E9558 mov r0, r4 mov r1, #0 @@ -1990,7 +1990,7 @@ _022DDC18: b _022DDD00 _022DDC4C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam bl ov11_022E958C mov r0, r4 mov r1, #1 @@ -1999,10 +1999,10 @@ _022DDC4C: b _022DDD00 _022DDC6C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r0 ldr r1, _022DDD5C ; =ov11_023193D4 add r0, sp, #0x20 @@ -2054,8 +2054,10 @@ _022DDD28: .word ov11_02319338 _022DDD2C: .word ov11_02319350 _022DDD30: .word ov11_02319370 _022DDD34: .word 0x00000113 -#ifdef EUROPE +#if defined(EUROPE) _022DDD38: .word 0x0000013E +#elif defined(JAPAN) +_022DDD38: .word 0x00000137 #else _022DDD38: .word 0x00000132 #endif @@ -2091,7 +2093,7 @@ RunNextOpcode: ; 0x022DDD64 addge r0, r1, r0, lsl #1 bge _022DDDCC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r2, [r4, #0x38] add r1, r0, #2 add r2, r2, #2 @@ -2488,7 +2490,7 @@ _022DE3AC: ; 0x022DE3AC addge r0, r2, r0, lsl #1 bge _022DE3E4 ldrh r0, [r2, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4, #0x1c] add r0, r0, #2 add r0, r1, r0, lsl #1 @@ -2498,7 +2500,7 @@ _022DE3E4: b _022E2478 _022DE3F0: ; 0x022DE3F0 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldr r1, _022DED10 ; =ov11_023193EC mov r2, r5 @@ -2526,11 +2528,11 @@ _022DE448: ; 0x022DE448 b _022E2478 _022DE458: ; 0x022DE458 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldrh r0, [r6, #2] mov r4, r1, asr #0x10 - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r0 mov r0, r4 mov r1, #0 @@ -2538,14 +2540,14 @@ _022DE458: ; 0x022DE458 b _022E2474 _022DE484: ; 0x022DE484 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldrh r0, [r6, #2] mov r5, r1, asr #0x10 - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0 mov r0, r5 mov r2, r4 @@ -2553,7 +2555,7 @@ _022DE484: ; 0x022DE484 b _022E2474 _022DE4BC: ; 0x022DE4BC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 mov r2, r4 @@ -2571,7 +2573,7 @@ _022DE4BC: ; 0x022DE4BC b _022E2474 _022DE500: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, _022DED18 ; =ov11_02324E80 strh r0, [r1, #8] ldrsh r2, [r1, #8] @@ -2620,7 +2622,7 @@ _022DE554: b _022E2478 _022DE5BC: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x18 mov r0, r0, asr #0x18 bl ov11_022E7E84 @@ -2628,7 +2630,7 @@ _022DE5BC: b _022E2478 _022DE5D8: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, _022DED18 ; =ov11_02324E80 strh r0, [r1, #2] ldrsh r2, [r1, #2] @@ -2660,7 +2662,7 @@ _022DE62C: b _022E2478 _022DE650: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 bl ov11_022F1710 ldr r1, _022DED18 ; =ov11_02324E80 @@ -2688,7 +2690,7 @@ _022DE6AC: b _022E2478 _022DE6B4: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0 mov r0, #1 bl ov11_022E7F28 @@ -2701,10 +2703,10 @@ _022DE6D0: str r1, [sp, #0x154] str r0, [sp, #0x150] ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam str r0, [sp, #0x150] ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam str r0, [sp, #0x154] cmp r5, #0x13 bgt _022DE728 @@ -2739,7 +2741,7 @@ _022DE758: b _022E2474 _022DE764: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 and r0, r4, #0xff bl ov11_022F1DA8 @@ -2760,23 +2762,23 @@ _022DE794: b _022E2474 _022DE7B0: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0 mov r0, #2 bl ov11_022E7F28 b _022E2474 _022DE7C8: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam and r0, r0, #0xff bl ov11_022F26DC b _022E2474 _022DE7DC: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0 mov r1, r1, lsr #0x10 @@ -2785,10 +2787,10 @@ _022DE7DC: b _022E2474 _022DE808: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0 mov r1, r1, lsr #0x10 @@ -2797,7 +2799,7 @@ _022DE808: b _022E2474 _022DE834: ; 0x022DE834 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x18 mvn r1, #0 cmp r1, r0, asr #24 @@ -2872,7 +2874,7 @@ _022DE928: b _022E2474 _022DE934: ; 0x022DE934 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 mov r1, #0 @@ -2908,7 +2910,7 @@ _022DE9B0: ; 0x022DE9B0 b _022E2478 _022DE9B8: ; 0x022DE9B8 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mvn r1, #0 cmp r1, r0, asr #16 @@ -2930,11 +2932,11 @@ _022DE9E8: b _022E2478 _022DEA08: ; 0x022DEA08 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0, lsl #0x10 ldrh r0, [r6, #2] mov r6, r7, asr #0x10 - bl ScriptParamToInt + bl ProcessScriptParam mvn r1, #0 mov r0, r0, lsl #0x18 cmp r1, r7, asr #16 @@ -2979,7 +2981,7 @@ _022DEAA0: b _022E2478 _022DEAC4: ; 0x022DEAC4 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov sb, r0, lsl #0x10 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -2987,7 +2989,7 @@ _022DEAC4: ; 0x022DEAC4 bl ov11_022E4248 mov r8, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x18 mvn r1, #0 cmp r1, sb, asr #16 @@ -3037,7 +3039,7 @@ _022DEB80: b _022E2478 _022DEBA4: ; 0x022DEBA4 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov sb, r0, lsl #0x10 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -3045,7 +3047,7 @@ _022DEBA4: ; 0x022DEBA4 bl ov11_022E4248 mov r8, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x18 mvn r1, #0 cmp r1, sb, asr #16 @@ -3092,7 +3094,7 @@ _022DEBA4: ; 0x022DEBA4 b _022E2478 _022DEC7C: ; 0x022DEC7C ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0, lsl #0x10 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -3117,7 +3119,7 @@ _022DEC7C: ; 0x022DEC7C b _022E2478 _022DECDC: ; 0x022DECDC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 mov r0, r4 @@ -3146,14 +3148,14 @@ _022DED40: .word 0x00000133 _022DED44: .word 0x0000012D _022DED48: ; 0x022DED48 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl UnlockScriptingLock b _022E2474 _022DED60: ; 0x022DED60 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 add r0, r4, #0x6c mov r1, r1, asr #0x10 @@ -3161,7 +3163,7 @@ _022DED60: ; 0x022DED60 b _022E2474 _022DED7C: ; 0x022DED7C ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 add r0, r4, #0x6c mov r1, r1, asr #0x10 @@ -3169,10 +3171,10 @@ _022DED7C: ; 0x022DED7C b _022E2474 _022DED98: ; 0x022DED98 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r2, r0 add r0, r4, #0x6c @@ -3181,13 +3183,13 @@ _022DED98: ; 0x022DED98 b _022E2474 _022DEDC4: ; 0x022DEDC4 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r1, r1, asr #0x10 mov r3, r5 @@ -3197,13 +3199,13 @@ _022DEDC4: ; 0x022DEDC4 b _022E2474 _022DEE00: ; 0x022DEE00 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r1, r1, asr #0x10 mov r3, r5 @@ -3215,13 +3217,13 @@ _022DEE00: ; 0x022DEE00 b _022E2474 _022DEE44: ; 0x022DEE44 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r1, r1, asr #0x10 mov r2, r5, lsl #0x10 @@ -3232,13 +3234,13 @@ _022DEE44: ; 0x022DEE44 b _022E2474 _022DEE84: ; 0x022DEE84 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r5, lsl #0x10 mov r2, r0 mov r1, r4 @@ -3247,7 +3249,7 @@ _022DEE84: ; 0x022DEE84 b _022E2474 _022DEEBC: ; 0x022DEEBC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, #0 mov r2, r1 @@ -3256,10 +3258,10 @@ _022DEEBC: ; 0x022DEEBC b _022E2474 _022DEEDC: ; 0x022DEEDC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0 mov r0, r4 and r1, r1, #0xff @@ -3277,10 +3279,10 @@ _022DEF04: ; 0x022DEF04 b _022E2474 _022DEF28: ; 0x022DEF28 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 mov r2, r7 add r0, r4, #0x6c @@ -3293,10 +3295,10 @@ _022DEF28: ; 0x022DEF28 b _022E2474 _022DEF64: ; 0x022DEF64 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r4, lsl #0x10 mov r1, r0 mov r0, r2, asr #0x10 @@ -3304,7 +3306,7 @@ _022DEF64: ; 0x022DEF64 b _022E2474 _022DEF8C: ; 0x022DEF8C ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 cmp r4, #0x3e8 blt _022DEFC0 @@ -3323,10 +3325,10 @@ _022DEFC0: b _022E2474 _022DEFD0: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r2, r0 add r0, r4, #0x6c @@ -3341,13 +3343,13 @@ _022DEFD0: b _022E2474 _022DF014: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r1, r1, asr #0x10 @@ -3362,13 +3364,13 @@ _022DF014: b _022E2474 _022DF064: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r0, r0, lsl #0x10 mov r2, r0, asr #0x10 @@ -3384,10 +3386,10 @@ _022DF064: b _022E2474 _022DF0B8: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r0, lsl #0x10 mov r1, r5, lsl #0x10 add r0, r4, #0x6c @@ -3402,13 +3404,13 @@ _022DF0B8: b _022E2474 _022DF0FC: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r5, r0 mov r1, r1, asr #0x10 @@ -3425,13 +3427,13 @@ _022DF0FC: b _022E2474 _022DF154: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3445,13 +3447,13 @@ _022DF154: b _022E2474 _022DF1A0: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3465,13 +3467,13 @@ _022DF1A0: b _022E2474 _022DF1EC: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3485,13 +3487,13 @@ _022DF1EC: b _022E2474 _022DF238: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3505,13 +3507,13 @@ _022DF238: b _022E2474 _022DF284: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r2, r0 mov r0, r1, asr #0x10 @@ -3525,10 +3527,10 @@ _022DF284: b _022E2474 _022DF2D0: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 mov r0, r7 bl GetPerformanceFlagWithChecks @@ -3540,7 +3542,7 @@ _022DF2D0: b _022E2474 _022DF308: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam cmp r0, #0 ldreqh r0, [r6, #2] ldreq r1, [r4, #0x14] @@ -3549,7 +3551,7 @@ _022DF308: b _022E2474 _022DF328: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam cmp r0, #0 ldreqh r0, [r6, #2] ldreq r1, [r4, #0x14] @@ -3558,7 +3560,7 @@ _022DF328: b _022E2474 _022DF348: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 mov r0, #0xb bl Debug_GetDebugFlag @@ -3590,7 +3592,7 @@ _022DF388: ; jump table b _022DF424 ; case 12 _022DF3BC: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 add r0, r4, #0x6c mov r1, r1, asr #0x10 @@ -3599,13 +3601,13 @@ _022DF3BC: b _022DF6FC _022DF3DC: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r5, r0 add r0, r4, #0x6c @@ -3618,13 +3620,13 @@ _022DF3DC: b _022DF6FC _022DF424: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r5, lsl #0x10 mov r5, r0 add r0, r4, #0x6c @@ -3643,7 +3645,7 @@ _022DF424: b _022DF6FC _022DF484: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam bl RandInt mov r7, r0 b _022DF6FC @@ -3652,7 +3654,7 @@ _022DF498: b _022DF6FC _022DF4A0: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 mov r0, #0 mov r2, r0 @@ -3662,7 +3664,7 @@ _022DF4A0: b _022DF6FC _022DF4C4: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r0, asr #0x10 mov r0, #0 @@ -3672,7 +3674,7 @@ _022DF4C4: b _022DF6FC _022DF4E8: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl GetDungeonMode @@ -3680,7 +3682,7 @@ _022DF4E8: b _022DF6FC _022DF504: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl sub_02065974 @@ -3721,7 +3723,7 @@ _022DF53C: b _022DF6FC _022DF59C: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -3764,7 +3766,7 @@ _022DF638: b _022DF6FC _022DF640: ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -3834,7 +3836,7 @@ _022DF728: ; 0x022DF728 b _022E2474 _022DF740: ; 0x022DF740 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam orr r2, r0, #0x10000 ldr r1, _022DFE18 ; =ov11_02324ECC ldr r0, _022DFE1C ; =ov11_02324EA4 @@ -3843,13 +3845,13 @@ _022DF740: ; 0x022DF740 b _022E2474 _022DF760: ; 0x022DF760 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r7, lsl #0x10 mov r4, r0 mov r0, r1, asr #0x10 @@ -3871,13 +3873,13 @@ _022DF760: ; 0x022DF760 b _022E2474 _022DF7CC: ; 0x022DF7CC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r4, r0 ldr r2, _022DFE18 ; =ov11_02324ECC @@ -3898,13 +3900,13 @@ _022DF7CC: ; 0x022DF7CC b _022E2474 _022DF834: ; 0x022DF834 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r4, r0 ldr r2, _022DFE18 ; =ov11_02324ECC @@ -3925,7 +3927,7 @@ _022DF834: ; 0x022DF834 b _022E2474 _022DF89C: ; 0x022DF89C ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0 ldr r0, _022DFE1C ; =ov11_02324EA4 and r1, r1, #0xff @@ -3938,10 +3940,10 @@ _022DF8B8: ; 0x022DF8B8 str r1, [sp, #0xd4] str r0, [sp, #0xd0] ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam str r0, [sp, #0xd0] ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam str r0, [sp, #0xd4] ldr r0, _022DFE1C ; =ov11_02324EA4 add r1, sp, #0xd0 @@ -3949,11 +3951,11 @@ _022DF8B8: ; 0x022DF8B8 b _022E2474 _022DF8F4: ; 0x022DF8F4 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, _022DED18 ; =ov11_02324E80 str r0, [r1, #0xc] ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r2, _022DED18 ; =ov11_02324E80 mov r1, r0 str r1, [r2, #0x10] @@ -4060,7 +4062,7 @@ _022DFA50: ; 0x022DFA50 b _022E2478 _022DFA78: ; 0x022DFA78 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r1, [r6, #2] add r0, r4, #0x14 @@ -4074,7 +4076,7 @@ _022DFA78: ; 0x022DFA78 b _022E2478 _022DFAAC: ; 0x022DFAAC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldr r1, _022DFE28 ; =ov11_023194C0 mov r0, #2 @@ -4119,10 +4121,18 @@ _022DFB20: beq _022DFB78 orr r0, r8, #8 orr r0, r0, #0x3000 +#ifdef JAPAN + ldr r1, _022E14D4 ; =0x00003008 + mov r0, r0, lsl #0x10 +#else mov r0, r0, lsl #0x10 ldr r1, _022DFE30 ; =0x0000025E +#endif ldr r2, _022DFE18 ; =ov11_02324ECC mov r0, r0, lsr #0x10 +#ifdef JAPAN + rsb r1, r1, #0x3500 +#endif bl sub_02034EB4 mov r0, #5 b _022E2478 @@ -4206,7 +4216,7 @@ _022DFC64: _022DFC94: ; 0x022DFC94 ldrh r0, [r6] ldr r5, [r4, #0x1c] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 mov r1, r6, lsl #0x10 add r0, r4, #0x6c @@ -4223,7 +4233,7 @@ _022DFC94: ; 0x022DFC94 b _022DFD0C _022DFCD8: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 mov r0, r7 mov r1, r6 @@ -4265,7 +4275,7 @@ _022DFD44: ; 0x022DFD44 str r2, [r0, #4] bne _022DFD88 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 _022DFD88: @@ -4314,6 +4324,9 @@ _022DFE20: .word ov11_023194B0 _022DFE24: .word ov11_02324E94 _022DFE28: .word ov11_023194C0 _022DFE2C: .word 0x0001002F +#ifdef JAPAN +_022E14D4: .word 0x00003008 +#endif _022DFE30: .word 0x0000025E _022DFE34: .word ov11_023194D8 _022DFE38: .word ov11_023194F4 @@ -4326,7 +4339,7 @@ _022DFE50: .word ov11_02319534 _022DFE54: .word ov11_02319554 _022DFE58: ldrh r0, [r7, #2] - bl ScriptParamToInt + bl ProcessScriptParam add sl, sp, #0x178 mov r1, r0 mov r0, sl @@ -4376,10 +4389,10 @@ _022DFED8: cmp r1, #0 ble _022DFFAC ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldr r1, _022DFE54 ; =ov11_02319554 mov r2, r5 @@ -4420,10 +4433,10 @@ _022DFFAC: b _022E2474 _022DFFC0: ; 0x022DFFC0 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam bl ov11_022E9B0C cmp r4, #0 beq _022E2474 @@ -4431,10 +4444,10 @@ _022DFFC0: ; 0x022DFFC0 b _022E2478 _022DFFE8: ; 0x022DFFE8 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam cmp r5, #0xdb bne _022E000C bl ov11_022E9B24 @@ -4448,16 +4461,16 @@ _022E0010: b _022E2478 _022E0020: ; 0x022E0020 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam cmp r5, #0xd7 bne _022E0078 sub r1, r8, #0x100 @@ -4485,10 +4498,10 @@ _022E0098: b _022E2478 _022E00A8: ; 0x022E00A8 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam bl ov11_022E9B84 cmp r4, #0 beq _022E2474 @@ -4496,10 +4509,10 @@ _022E00A8: ; 0x022E00A8 b _022E2478 _022E00D0: ; 0x022E00D0 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam cmp r5, #0xdc bne _022E00F4 bl ov11_022E9BD0 @@ -4513,16 +4526,16 @@ _022E00F8: b _022E2478 _022E0108: ; 0x022E0108 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam cmp r5, #0xd8 bne _022E0160 sub r1, r8, #0x100 @@ -4550,10 +4563,10 @@ _022E0180: b _022E2478 _022E0190: ; 0x022E0190 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam bl ov11_022E9C98 cmp r4, #0 beq _022E2474 @@ -4561,10 +4574,10 @@ _022E0190: ; 0x022E0190 b _022E2478 _022E01B8: ; 0x022E01B8 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam cmp r5, #0xea bne _022E01DC bl ov11_022E9CB0 @@ -4578,16 +4591,16 @@ _022E01E0: b _022E2478 _022E01F0: ; 0x022E01F0 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam cmp r5, #0xe6 bne _022E0248 sub r1, r8, #0x100 @@ -4615,22 +4628,22 @@ _022E0268: b _022E2478 _022E0278: ; 0x022E0278 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov sb, r0 ldrh r0, [r6, #8] - bl ScriptParamToInt + bl ProcessScriptParam mov sl, r0 ldrh r0, [r6, #0xa] - bl ScriptParamToInt + bl ProcessScriptParam ldr r6, _022E1218 ; =ov11_02316A44 add r3, sp, #0xcc mov r2, #4 @@ -4687,16 +4700,16 @@ _022E0368: b _022E2478 _022E0378: ; 0x022E0378 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [r4, #0x46] mov r0, #3 b _022E2478 _022E038C: ; 0x022E038C ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam sub r0, r0, r5 bl RandInt add r0, r5, r0 @@ -4748,7 +4761,7 @@ _022E0424: stmia r5, {r0, r1, r2, r3} _022E0434: ; 0x022E0434 ldrh r0, [r6] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldr r1, _022E121C ; =ov11_0231956C mov r2, r5 @@ -5103,7 +5116,7 @@ _022E091C: b _022E199C _022E092C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r2, [r4] mov r1, r0 ldr r0, [r4, #4] @@ -5112,7 +5125,7 @@ _022E092C: b _022E246C _022E094C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 tst r5, #0x10 beq _022E0974 @@ -5130,7 +5143,7 @@ _022E0974: b _022E246C _022E098C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5140,7 +5153,7 @@ _022E098C: b _022E246C _022E09B0: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5150,7 +5163,7 @@ _022E09B0: b _022E246C _022E09D4: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5160,7 +5173,7 @@ _022E09D4: b _022E246C _022E09F8: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5170,7 +5183,7 @@ _022E09F8: b _022E246C _022E0A1C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5180,7 +5193,7 @@ _022E0A1C: b _022E246C _022E0A40: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 ldr r1, [r4] ldr r0, [r4, #4] @@ -5190,7 +5203,7 @@ _022E0A40: b _022E246C _022E0A64: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5208,13 +5221,13 @@ _022E0A64: b _022E246C _022E0AA8: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r6, r0 ldr r2, [r1, #0x38] @@ -5264,10 +5277,10 @@ _022E0B5C: b _022E2478 _022E0B78: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r0 cmp r2, #0 ldr r1, [r4] @@ -5295,10 +5308,10 @@ _022E0BC8: b _022E246C _022E0BEC: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 cmp r5, #0 beq _022E0C2C @@ -5321,7 +5334,7 @@ _022E0C2C: b _022E246C _022E0C4C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldr r2, [r4] ldr r0, [r4, #4] @@ -5333,7 +5346,7 @@ _022E0C4C: b _022E246C _022E0C78: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 ldr r2, [r4] ldr r0, [r4, #4] @@ -5363,7 +5376,7 @@ _022E0CA4: b _022E246C _022E0CE8: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, _022E122C ; =ov11_02316A44 mov r5, r0 mov r0, r5, lsl #0x10 @@ -5414,7 +5427,7 @@ _022E0CE8: b _022E246C _022E0DB0: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -5477,10 +5490,10 @@ _022E0E8C: str r1, [sp, #0x44] str r0, [sp, #0x40] ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sp, #0x40] ldrh r0, [r6, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sp, #0x44] ldr r1, [r4] ldr r0, [r4, #4] @@ -5495,10 +5508,10 @@ _022E0ED0: str r1, [sp, #0x4c] str r0, [sp, #0x48] ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sp, #0x48] ldrh r0, [r6, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sp, #0x4c] ldr r1, [r4] ldr r0, [r4, #4] @@ -5513,10 +5526,10 @@ _022E0F14: ldr r1, [r1, #0x30] str r2, [sp, #0x50] str r1, [sp, #0x54] - bl ScriptParamToInt + bl ProcessScriptParam str r0, [sp, #0x50] ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, _022E122C ; =ov11_02316A44 str r0, [sp, #0x54] ldr r2, [r1, #0x48] @@ -5539,7 +5552,7 @@ _022E0F14: b _022E246C _022E0F8C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -5570,7 +5583,7 @@ _022E0FC8: b _022E246C _022E1000: ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r2, [r4] mov r1, r0 ldr r0, [r4, #4] @@ -5582,7 +5595,7 @@ _022E1020: add r0, r1, #2 str r0, [r4, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] ldrsh r2, [r4, #0x3c] mvn r1, #0 @@ -5598,7 +5611,7 @@ _022E105C: add r0, r1, #2 str r0, [r4, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] ldrsh r2, [r4, #0x3c] mov r1, #0 @@ -5613,7 +5626,7 @@ _022E1094: add r0, r1, #2 str r0, [r4, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [r4, #0x46] ldrsh r2, [r4, #0x3c] mov r1, #0x100 @@ -5626,7 +5639,7 @@ _022E1094: b _022E2478 _022E10D0: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam strb r0, [r4, #0x42] ldr r2, [r4] ldrsb r1, [r4, #0x42] @@ -5636,14 +5649,14 @@ _022E10D0: b _022E246C _022E10F4: ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 movs r7, r0 bmi _022E246C ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 add r1, sp, #9 mov r0, r7 @@ -5660,7 +5673,7 @@ _022E10F4: b _022E246C _022E1150: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5689,7 +5702,7 @@ _022E1198: b _022E126C _022E11BC: ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -5739,7 +5752,7 @@ _022E126C: cmp r5, #0 beq _022E246C ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -5789,7 +5802,7 @@ _022E130C: b _022E246C _022E1334: ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam strb r0, [r4, #0x69] mov r0, #0 strh r0, [r4, #0x46] @@ -5797,7 +5810,7 @@ _022E1334: b _022E2478 _022E1350: ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5824,13 +5837,13 @@ _022E13A0: b _022E2478 _022E13B0: ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r8, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #8] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5853,7 +5866,7 @@ _022E13B0: b _022E2478 _022E1420: ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam strb r0, [r4, #0x42] ldr r2, [r4] ldrsb r1, [r4, #0x42] @@ -5861,16 +5874,16 @@ _022E1420: ldr r2, [r2, #0x2c] blx r2 ldrh r0, [r6, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [r4, #0x46] mov r0, #3 b _022E2478 _022E1460: ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0x14] @@ -5887,19 +5900,19 @@ _022E1460: ldr r2, [r2, #0x2c] blx r2 ldrh r0, [r6, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [r4, #0x46] mov r0, #3 b _022E2478 _022E14C4: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #8] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 mov r0, r4 strh r5, [r4, #0x46] @@ -5910,10 +5923,10 @@ _022E14C4: b _022E2478 _022E14F8: ldrh r0, [r6, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x64] ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] mvn r0, #0 strh r0, [r4, #0x46] @@ -5921,13 +5934,13 @@ _022E14F8: b _022E2478 _022E1520: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam and r1, r7, #0xff mov r2, r5 mov r3, r0 @@ -5937,13 +5950,13 @@ _022E1520: b _022E2478 _022E155C: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r6, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r6, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 cmp r7, #0x49 moveq r0, #0 @@ -6024,7 +6037,7 @@ _022E1674: blx r1 mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r3, r0 mov r0, r5 mov r1, r7 @@ -6034,7 +6047,7 @@ _022E1674: b _022E2478 _022E16C4: ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r3, r0 cmp r7, #0x43 moveq r0, #0 @@ -6046,7 +6059,7 @@ _022E16C4: b _022E2478 _022E16F0: ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6067,7 +6080,7 @@ _022E1734: add r0, r1, #2 str r0, [r4, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] ldrsh r1, [r4, #0x3c] mov r0, #3 @@ -6087,7 +6100,7 @@ _022E1760: blx r1 mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r3, r0 mov r0, r5 mov r1, r7 @@ -6097,7 +6110,7 @@ _022E1760: b _022E2478 _022E17B0: ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r3, r0 cmp r7, #0x39 moveq r0, #0 @@ -6109,7 +6122,7 @@ _022E17B0: b _022E2478 _022E17DC: ldrh r0, [r6, #2] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6130,7 +6143,7 @@ _022E1820: add r0, r1, #2 str r0, [r4, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [r4, #0x4c] ldrsh r2, [r4, #0x3c] mov r1, #0 @@ -6153,7 +6166,7 @@ _022E1858: blx r1 mov r4, r0 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 mov r0, r5 mov r1, r7 @@ -6163,7 +6176,7 @@ _022E1858: b _022E2478 _022E18A8: ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r0 cmp r7, #0x3e moveq r0, #0 @@ -6179,7 +6192,7 @@ _022E18D4: ldr r1, [r1, #4] blx r1 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6201,7 +6214,7 @@ _022E1928: ldr r1, [r1, #4] blx r1 ldrh r0, [r6, #2] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [r4] mov r5, r0 ldr r2, [r1, #0xc] @@ -6396,11 +6409,11 @@ _022E1BD0: b _022E2464 _022E1BE0: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0, lsl #0x10 ldrh r0, [r5, #4] mov r5, r6, asr #0x10 - bl ScriptParamToInt + bl ProcessScriptParam mvn r1, #0 mov r7, r0 cmp r1, r6, asr #16 @@ -6441,11 +6454,15 @@ _022E1C5C: b _022E2464 _022E1C88: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0, lsl #0x10 ldrh r0, [r5, #4] +#ifdef JAPAN + mov r5, r7, asr #0x10 +#else mov r8, r7, asr #0x10 - bl ScriptParamToInt +#endif + bl ProcessScriptParam mvn r0, #0 cmp r0, r7, asr #16 bne _022E1CF8 @@ -6470,7 +6487,11 @@ _022E1CE0: mov r0, #5 b _022E2478 _022E1CF8: +#ifdef JAPAN + cmp r5, #0xfb +#else cmp r8, #0xfb +#endif bne _022E1D70 bl sub_0204E70C add r1, r6, #0x6f @@ -6502,10 +6523,15 @@ _022E1D5C: strh r0, [r4, #0xe] b _022E2464 _022E1D70: +#ifdef JAPAN + cmp r5, #0xfa +#else cmp r8, #0xfa +#endif moveq r0, #1 streqh r0, [r4, #0x44] beq _022E1E20 +#ifndef JAPAN mov r0, r8 bl DungeonSwapIdxToId mov r5, r0 @@ -6519,15 +6545,23 @@ _022E1D70: bl SaveScriptVariableValue mov r0, r8 bl SetEnterDungeon +#endif cmp r6, #0x8c beq _022E1DD0 +#ifdef JAPAN + mov r2, r5 +#else mov r2, r8 +#endif mov r0, #0 mov r1, #0x26 bl SaveScriptVariableValue +#ifndef JAPAN b _022E1E18 +#endif _022E1DD0: mov r0, r5 +#ifndef JAPAN bl CheckMissionRestrictions tst r0, #0x20 movne r1, #7 @@ -6547,6 +6581,7 @@ _022E1E08: str r0, [r4, #0x1c] b _022E2464 _022E1E18: +#endif mov r0, #1 strh r0, [r4, #0x44] _022E1E20: @@ -6554,7 +6589,7 @@ _022E1E20: b _022E2478 _022E1E28: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 mov r0, r4 mov r1, #1 @@ -6565,12 +6600,12 @@ _022E1E28: b _022E2464 _022E1E50: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam bl WorldMapSetMode b _022E2464 _022E1E60: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 @@ -6581,7 +6616,7 @@ _022E1E60: b _022E2464 _022E1E88: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x18 mov r0, r0, asr #0x18 @@ -6592,7 +6627,7 @@ _022E1E88: b _022E2464 _022E1EB0: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x10 mov r0, r0, asr #0x10 @@ -6604,7 +6639,7 @@ _022E1EB0: b _022E2464 _022E1EDC: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 mov r0, r4, lsl #0x10 mov r0, r0, asr #0x10 @@ -6616,7 +6651,7 @@ _022E1EDC: b _022E2464 _022E1F08: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_0230F1EC @@ -6627,14 +6662,14 @@ _022E1F20: b _022E2464 _022E1F2C: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl WorldMapSetCamera b _022E2464 _022E1F44: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_0230F0EC @@ -6645,20 +6680,20 @@ _022E1F5C: b _022E2464 _022E1F68: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_0230F21C b _022E2464 _022E1F80: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r6, lsl #0x10 strh r0, [sp, #0xca] add r1, sp, #0xc8 @@ -6671,10 +6706,10 @@ _022E1FBC: b _022E2478 _022E1FC4: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 mov r1, r5, lsl #0x10 add r0, r4, #0x6c @@ -6695,10 +6730,10 @@ _022E1FC4: b _022E2464 _022E2020: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r6, lsl #0x10 mov r5, r0 add r1, sp, #0xc0 @@ -6722,7 +6757,7 @@ _022E207C: b _022E2464 _022E2084: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r0, r0, lsl #0x10 @@ -6731,7 +6766,7 @@ _022E2084: b _022E2464 _022E20A4: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 ldr r1, _022E229C ; =0x000003E7 mov r0, r0, lsr #0x10 @@ -6744,13 +6779,13 @@ _022E20C8: b _022E2464 _022E20D0: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0 ldr r2, _022E229C ; =0x000003E7 @@ -6771,7 +6806,7 @@ _022E2128: b _022E2464 _022E2130: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r0, r0, lsl #0x10 @@ -6780,10 +6815,10 @@ _022E2130: b _022E2464 _022E2150: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0, lsl #0x10 mov r0, r1, lsr #0x10 @@ -6792,7 +6827,7 @@ _022E2150: b _022E2464 _022E217C: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 ldr r1, _022E229C ; =0x000003E7 mov r0, r0, lsr #0x10 @@ -6805,13 +6840,13 @@ _022E21A0: b _022E2464 _022E21A8: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0 ldr r2, _022E229C ; =0x000003E7 @@ -6832,7 +6867,7 @@ _022E2200: b _022E2464 _022E2208: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r0, r0, lsl #0x10 @@ -6841,10 +6876,10 @@ _022E2208: b _022E2464 _022E2228: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0, lsl #0x10 mov r0, r1, lsr #0x10 @@ -6853,7 +6888,7 @@ _022E2228: b _022E2464 _022E2254: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C50 @@ -6862,6 +6897,7 @@ _022E226C: bl sub_02017C5C b _022E2464 .align 2, 0 +#ifndef JAPAN _022E2274: .word ov11_02316A60 _022E2278: .word SCRIPT_COMMAND_PARSING_DATA _022E227C: .word 0x00000127 @@ -6873,19 +6909,20 @@ _022E2290: .word 0x00000297 _022E2294: .word 0x00000299 _022E2298: .word 0x00000295 _022E229C: .word 0x000003E7 +#endif _022E22A0: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C80 b _022E2464 _022E22B8: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r4, lsl #0x10 mov r2, r0, lsl #0x10 mov r0, r1, lsr #0x10 @@ -6894,10 +6931,10 @@ _022E22B8: b _022E2464 _022E22E4: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r0, lsl #0x10 mov r1, r4, lsl #0x10 mov r0, r1, lsr #0x10 @@ -6906,15 +6943,28 @@ _022E22E4: mov r2, #0x100 bl sub_02017C90 b _022E2464 +#ifdef JAPAN +_022E2274: .word ov11_02316A60 +_022E2278: .word SCRIPT_COMMAND_PARSING_DATA +_022E227C: .word 0x00000127 +_022E2280: .word 0x00000179 +_022E2284: .word ov11_0231958C +_022E2288: .word ov11_023195AC +_022E228C: .word 0x00000296 +_022E2290: .word 0x00000297 +_022E2294: .word 0x00000299 +_022E2298: .word 0x00000295 +_022E229C: .word 0x000003E7 +#endif _022E2318: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r2, r4, lsl #0x10 mov r2, r2, lsr #0x10 @@ -6927,13 +6977,13 @@ _022E2318: b _022E2464 _022E2360: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0, lsl #0x10 mov r2, r4, lsl #0x10 @@ -6944,13 +6994,13 @@ _022E2360: b _022E2464 _022E23A0: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r6, lsl #0x10 mov r3, r0, lsl #0x10 mov r2, r4, lsl #0x10 @@ -6961,17 +7011,17 @@ _022E23A0: b _022E2464 _022E23E0: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017CB4 b _022E2464 _022E23F8: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r4, r0 ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam cmp r0, #0 movlt r0, #0x1e mov r1, r4, lsl #0x10 @@ -6988,7 +7038,7 @@ _022E242C: b _022E2464 _022E2440: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl sub_0206C0EC @@ -7325,7 +7375,7 @@ _022E2690: ; jump table b _022E2BF0 ; case 162 _022E291C: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 @@ -7365,7 +7415,7 @@ _022E29A8: b _022E3C5C _022E29B4: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 @@ -7393,7 +7443,7 @@ _022E2A10: b _022E3C5C _022E2A1C: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 mov r0, r6, lsl #0x10 mov r0, r0, asr #0x10 @@ -7486,7 +7536,7 @@ _022E2B30: b _022E3C5C _022E2B60: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017B18 @@ -7497,7 +7547,7 @@ _022E2B60: b _022E3C5C _022E2B88: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017B94 @@ -7515,7 +7565,7 @@ _022E2BB0: b _022E3C5C _022E2BC8: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C10 @@ -7526,7 +7576,7 @@ _022E2BC8: b _022E3C5C _022E2BF0: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_02017C68 @@ -7688,7 +7738,7 @@ _022E2E30: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r1, [sb, #0x50] add r0, r1, r0 str r0, [sb, #0x58] @@ -7696,7 +7746,7 @@ _022E2E30: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r1, [sb, #0x54] add r0, r1, r0 str r0, [sb, #0x5c] @@ -7724,13 +7774,13 @@ _022E2EB8: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sb, #0x58] ldr r1, [sb, #0x38] add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sb, #0x5c] ldrsh r0, [sb, #0x3c] sub r0, r0, #2 @@ -7741,7 +7791,7 @@ _022E2EF8: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -7760,7 +7810,7 @@ _022E2F40: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -7777,7 +7827,7 @@ _022E2F40: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [sb, #0x46] b _022E2FE4 _022E2FA0: @@ -7793,7 +7843,7 @@ _022E2FA0: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [sb, #0x46] ldrsh r0, [sb, #0x3c] sub r0, r0, #5 @@ -7967,7 +8017,7 @@ _022E3238: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r1, [sb, #0x50] add r0, r1, r0 str r0, [sb, #0x58] @@ -7975,7 +8025,7 @@ _022E3238: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 ldr r1, [sb, #0x54] add r0, r1, r0 str r0, [sb, #0x5c] @@ -8003,13 +8053,13 @@ _022E32C0: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sb, #0x58] ldr r1, [sb, #0x38] add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 str r0, [sb, #0x5c] ldrsh r0, [sb, #0x3c] sub r0, r0, #2 @@ -8020,13 +8070,13 @@ _022E3300: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [sb, #0x38] mov r6, r0 add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [sb] mov r4, r0 ldr r0, [sb, #4] @@ -8053,7 +8103,7 @@ _022E3380: add r0, r1, #2 str r0, [sb, #0x38] ldrh r0, [r1] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -8141,7 +8191,7 @@ _022E34C8: b _022E3564 _022E34D0: ldrh r0, [r4, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -8211,7 +8261,7 @@ _022E35BC: streqh r0, [sb, #0xe] beq _022E3C5C ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r2, r0 ldrsb r0, [sp, #0xc] mov r1, r6 @@ -8224,7 +8274,7 @@ _022E35BC: ldr r2, [r2, #0x2c] blx r2 ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [sb, #0x46] b _022E3C5C _022E361C: @@ -8235,10 +8285,10 @@ _022E361C: movgt r5, #0 bgt _022E3C5C ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r1, [sb] mov r4, r0 ldr r2, [r1, #0x14] @@ -8321,7 +8371,7 @@ _022E376C: cmp r0, #0 bgt _022E3884 ldrh r0, [r4, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F7E10 @@ -8387,7 +8437,7 @@ _022E3840: blx r2 _022E3874: ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam strh r0, [sb, #0x48] b _022E388C _022E3884: @@ -8452,13 +8502,13 @@ _022E3938: b _022E3C5C _022E395C: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r7, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #6] - bl ScriptParamToInt + bl ProcessScriptParam ldr r2, [sb] mov r4, r0 ldr r0, [sb, #4] @@ -8776,13 +8826,13 @@ _022E3DC0: cmp r0, #0 bne _022E3E18 ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r6, lsl #0x10 mov r2, r0 mov r1, r5 @@ -8812,13 +8862,13 @@ _022E3E38: cmp r0, #0 bne _022E3E9C ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #6] - bl ScriptParamToInt + bl ProcessScriptParam mov r3, r6, lsl #0x10 mov r2, r0 mov r1, r5 @@ -8853,7 +8903,7 @@ _022E3ED4: b _022E4238 _022E3EEC: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F88A0 @@ -8864,7 +8914,7 @@ _022E3EEC: b _022E4238 _022E3F14: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022FC67C @@ -8875,7 +8925,7 @@ _022E3F14: b _022E4238 _022E3F3C: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022FDE1C @@ -8886,7 +8936,7 @@ _022E3F3C: b _022E4238 _022E3F64: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl ov11_022F75F0 @@ -8897,10 +8947,10 @@ _022E3F64: b _022E4238 _022E3F8C: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r5, lsl #0x10 mov r0, r0, asr #0x10 @@ -8913,10 +8963,10 @@ _022E3F8C: b _022E4238 _022E3FC8: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r5, lsl #0x10 mov r0, r0, asr #0x10 @@ -8929,10 +8979,10 @@ _022E3FC8: b _022E4238 _022E4004: ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x10 mov r1, r5, lsl #0x10 mov r0, r0, asr #0x10 @@ -8973,7 +9023,7 @@ _022E4078: cmp r5, #5 bne _022E40D4 ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r1, [r4, #4] add r0, r7, #0x14 @@ -8986,17 +9036,17 @@ _022E40D4: cmp r5, #8 ldrh r0, [r4, #2] bne _022E4104 - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 and r0, r5, #0xff mov r1, r1, asr #0x10 bl ov11_022F2790 b _022E4124 _022E4104: - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r1, [r4, #4] add r0, r7, #0x14 @@ -9028,7 +9078,7 @@ _022E4140: strneh r0, [r7, #0xe] bne _022E4238 ldrh r0, [r4, #0xa] - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r1, [r4, #0xc] add r0, r7, #0x14 @@ -9053,7 +9103,7 @@ _022E41A8: cmp r0, #2 bne _022E421C ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r1, [r4, #4] add r0, r7, #0x14 @@ -9110,7 +9160,7 @@ ov11_022E425C: ; 0x022E425C cmp r0, #0x72 bne _022E42BC ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r0, r0, lsl #0x18 mov r4, r0, asr #0x18 mov r0, r7 @@ -9127,7 +9177,7 @@ _022E42BC: cmp r0, #0x73 bne _022E430C ldrh r0, [r4, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r1, r0, lsl #0x10 mov r0, r7 mov r1, r1, asr #0x10 @@ -9135,7 +9185,7 @@ _022E42BC: cmp r0, #0 beq _022E4344 ldrh r0, [r4, #4] - bl ScriptParamToInt + bl ProcessScriptParam strb r0, [r7, #0x16] ldrsh r1, [r8, #0x10] mov r0, #1 @@ -9241,7 +9291,7 @@ _022E442C: ; jump table b _022E4514 ; case 6 _022E4448: ldrh r0, [r5, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov sb, r0 mov r0, r4 mov r1, sl @@ -9268,7 +9318,7 @@ _022E44A0: b _022E4418 _022E44AC: ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov sb, r0 ldrh r2, [r5, #2] ldr r1, _022E45B4 ; =ov11_02319640 @@ -9296,7 +9346,7 @@ _022E4508: b _022E4418 _022E4514: ldrh r0, [r5, #4] - bl ScriptParamToInt + bl ProcessScriptParam mov sb, r0 ldrh r2, [r5, #2] ldr r1, _022E45B8 ; =ov11_02319658 @@ -9607,8 +9657,8 @@ _022E48A4: .word ov11_02319694 _022E48A8: .word ov11_02324F70 arm_func_end SsbLoad2 - arm_func_start ScriptParamToInt -ScriptParamToInt: ; 0x022E48AC + arm_func_start ProcessScriptParam +ProcessScriptParam: ; 0x022E48AC tst r0, #0x4000 movne r1, #0x8000 rsbne r1, r1, #0 @@ -9623,10 +9673,10 @@ ScriptParamToInt: ; 0x022E48AC bx lr .align 2, 0 _022E48DC: .word 0x00003FFF - arm_func_end ScriptParamToInt + arm_func_end ProcessScriptParam - arm_func_start ScriptParamToFixedPoint16 -ScriptParamToFixedPoint16: ; 0x022E48E0 + arm_func_start ov11_022E48E0 +ov11_022E48E0: ; 0x022E48E0 tst r0, #0x4000 movne r1, #0x8000 rsbne r1, r1, #0 @@ -9639,7 +9689,7 @@ ScriptParamToFixedPoint16: ; 0x022E48E0 bx lr .align 2, 0 _022E4908: .word 0x00003FFF - arm_func_end ScriptParamToFixedPoint16 + arm_func_end ov11_022E48E0 arm_func_start ov11_022E490C ov11_022E490C: ; 0x022E490C @@ -9647,15 +9697,15 @@ ov11_022E490C: ; 0x022E490C mov r7, r0 ldrh r0, [r7] mov r4, r1 - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [r7, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 tst r5, #4 bne _022E4958 ldrh r0, [r7, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r0, r0, lsl #3 str r0, [r4] tst r5, #2 @@ -9666,7 +9716,7 @@ _022E4958: tst r6, #4 ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldrh r0, [r7, #6] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r0, r0, lsl #3 str r0, [r4, #4] tst r6, #2 @@ -9684,21 +9734,21 @@ ov11_022E4984: ; 0x022E4984 mov sb, r1 mov r8, r2 mov r7, r3 - bl ScriptParamToInt + bl ProcessScriptParam mov r5, r0 ldrh r0, [sl, #2] - bl ScriptParamToInt + bl ProcessScriptParam mov r6, r0 ldrh r0, [sl, #8] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r4, r0 ldrh r0, [sl, #0xa] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov fp, r0 tst r5, #4 bne _022E49F4 ldrh r0, [sl, #4] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r0, r0, lsl #3 str r0, [sb] tst r5, #2 @@ -9716,7 +9766,7 @@ _022E49FC: str r0, [r8] bne _022E4A34 ldrh r0, [sl, #6] - bl ScriptParamToFixedPoint16 + bl ov11_022E48E0 mov r0, r0, lsl #3 str r0, [sb, #4] tst r6, #2 @@ -11542,11 +11592,18 @@ _022E6274: b _022E68AC _022E6294: bl ov11_02310BDC +#ifdef JAPAN + mov r1, #0x400 +#endif mov r4, #0 ldr r3, _022E68CC ; =0x0000C402 add r0, sp, #0x60 +#ifdef JAPAN + add r2, r1, #0xc5 +#else mov r1, #0x400 mov r2, #0x234 +#endif str r4, [sp] bl PreprocessStringFromId add r0, sp, #0xa0 @@ -12547,7 +12604,11 @@ _022E6FF0: ; jump table b _022E7088 ; case 4 b _022E70BC ; case 5 _022E7008: +#ifdef JAPAN + ldr r1, _022E872C ; =0x000004F2 +#else mov r1, #0x258 +#endif bl GetStringFromFileVeneer b _022E70F8 _022E7014: @@ -12589,9 +12650,15 @@ _022E7088: bl CountNbItemsOfTypeInBag str r0, [sp, #0x78] add ip, sp, #0x54 +#ifdef JAPAN + ldr r2, _022E873C ; =0x000004F6 + mov r0, r4 + mov r1, #0x40 +#else mov r0, r4 mov r1, #0x40 mov r2, #0x25c +#endif mov r3, #0x400 str ip, [sp] bl PreprocessStringFromId @@ -12617,10 +12684,19 @@ _022E70F8: add sp, sp, #0x144 ldmia sp!, {r3, r4, pc} .align 2, 0 +#ifdef JAPAN +_022E872C: .word 0x000004F2 +_022E7100: .word 0x000004F3 +_022E7104: .word 0x000004F4 +_022E7108: .word 0x000004F5 +_022E873C: .word 0x000004F6 +_022E710C: .word 0x000004F7 +#else _022E7100: .word 0x00000259 _022E7104: .word 0x0000025A _022E7108: .word 0x0000025B _022E710C: .word 0x0000025D +#endif arm_func_end ov11_022E6FD8 arm_func_start ov11_022E7110 @@ -14265,7 +14341,11 @@ _022E861C: ldr r0, _022E865C ; =ov11_02324CAC ldr r1, _022E8660 ; =0x00003218 ldr r3, [r0] +#ifdef JAPAN + mov r2, #0x500 +#else mov r2, #0x260 +#endif ldrsb r0, [r3, #4] add r3, r3, #0x18 bl ShowStringIdInDialogueBox @@ -14280,7 +14360,11 @@ _022E8654: .align 2, 0 _022E865C: .word ov11_02324CAC _022E8660: .word 0x00003218 +#ifdef JAPAN +_022E8664: .word 0x000004FF +#else _022E8664: .word 0x0000025F +#endif _022E8668: .word 0x00000133 arm_func_end ov11_022E84E4 @@ -23159,7 +23243,7 @@ ov11_022EFD5C: ; 0x022EFD5C str r2, [r0, #0x10] str r2, [r0, #0x14] str r2, [r0, #0x18] -#ifdef EUROPE +#if defined(EUROPE) cmp r1, #0 add r0, r5, #0x100 ldrsh r1, [r0, #0xbe] @@ -23367,6 +23451,188 @@ _022F097C: cmp r1, r0 beq _022F032C b _022F03A8 +#elif defined(JAPAN) + cmp r1, #0 + add r0, r5, #0x100 + ldrsh r1, [r0, #0xbe] + moveq r3, #0 + movne r3, #1 + ldr r0, _022F1A08 ; =0x00000165 + and r4, r3, #0xff + cmp r1, r0 + bgt _022F1524 + bge _022F0114 + sub r3, r0, #0x52 + cmp r1, r3 + bgt _022F1480 + sub r3, r0, #0x53 + cmp r1, r3 + blt _022F1410_JP + beq _022F1644 + sub r0, r0, #0x52 + cmp r1, r0 + beq _022F19DC + b _022F03A8 +_022F1410_JP: + cmp r1, #0xdc + bgt _022F1440 + bge _022F1644 + cmp r1, #0x85 + bgt _022F1434 + bge _022F1644 + cmp r1, #8 + beq _022F0008 + b _022F03A8 +_022F1434: + cmp r1, #0xd4 + beq _022F1644 + b _022F03A8 +_022F1440: + cmp r1, #0x10c + bgt _022F1470 + bge _022F1A00 + cmp r1, #0xf5 + bgt _022F03A8 + cmp r1, #0xf3 + blt _022F03A8 + beq _022F0064 + cmp r1, #0xf4 + cmpne r1, #0xf5 + beq _022F0028 + b _022F03A8 +_022F1470: + sub r0, r0, #0x54 + cmp r1, r0 + beq _022F0114 + b _022F03A8 +_022F1480: + sub r3, r0, #0x2f + cmp r1, r3 + bgt _022F14FC + sub r0, r0, #0x3b + subs r0, r1, r0 + addpl pc, pc, r0, lsl #2 + b _022F14D0 +_022F149C: ; jump table + b _022F0048 ; case 0 + b _022F1688 ; case 1 + b _022F03A8 ; case 2 + b _022F03A8 ; case 3 + b _022F0054 ; case 4 + b _022F03A8 ; case 5 + b _022F03A8 ; case 6 + b _022F03A8 ; case 7 + b _022F03A8 ; case 8 + b _022F03A8 ; case 9 + b _022F03A8 ; case 10 + b _022F03A8 ; case 11 + b _022F016C ; case 12 +_022F14D0: + cmp r1, #0x128 + bgt _022F14EC + bge _022F0054 + ldr r0, _022F1A0C_JP ; =0x00000127 + cmp r1, r0 + beq _022F1688 + b _022F03A8 +_022F14EC: + ldr r0, _022F1A10 ; =0x00000129 + cmp r1, r0 + beq _022F0054 + b _022F03A8 +_022F14FC: + cmp r1, #0x15c + bgt _022F1518 + bge _022F0008 + sub r0, r0, #0xa + cmp r1, r0 + beq _022F0064 + b _022F03A8 +_022F1518: + cmp r1, #0x164 + beq _022F170C + b _022F03A8 +_022F1524: + add r3, r0, #0x35 + cmp r1, r3 + bgt _022F15A4 + mov r2, r3 + cmp r1, r2 + bge _022F1644 + add r2, r0, #0x18 + cmp r1, r2 + bgt _022F1578 + bge _022F1644 + cmp r1, #0x174 + bgt _022F1568 + bge _022F0028 + add r0, r0, #0xa + cmp r1, r0 + beq _022F0028 + b _022F03A8 +_022F1568: + add r0, r0, #0x10 + cmp r1, r0 + beq _022F0028 + b _022F03A8 +_022F1578: + cmp r1, #0x18c + bgt _022F1594 + bge _022F1644 + add r0, r0, #0x22 + cmp r1, r0 + beq _022F0028 + b _022F03A8 +_022F1594: + add r0, r0, #0x30 + cmp r1, r0 + beq _022F0018 + b _022F03A8 +_022F15A4: + cmp r1, #0x1b0 + bgt _022F15E0 + bge _022F1688 + add r2, r0, #0x41 + cmp r1, r2 + bgt _022F15D0 + bge _022F1688 + add r0, r0, #0x40 + cmp r1, r0 + beq _022F1688 + b _022F03A8 +_022F15D0: + add r0, r0, #0x45 + cmp r1, r0 + beq _022F1644 + b _022F03A8 +_022F15E0: + add r3, r0, #0x50 + cmp r1, r3 + bgt _022F1608 + mov r2, r3 + cmp r1, r2 + bge _022F01D0 + add r0, r0, #0x4c + cmp r1, r0 + beq _022F1688 + b _022F03A8 +_022F1608: + add r0, r0, #0x51 + sub r0, r1, r0 + cmp r0, #9 + addls pc, pc, r0, lsl #2 + b _022F03A8 +_022F161C: ; jump table + b _022F01D0 ; case 0 + b _022F0244 ; case 1 + b _022F0228 ; case 2 + b _022F0244 ; case 3 + b _022F03A8 ; case 4 + b _022F02A4 ; case 5 + b _022F0304 ; case 6 + b _022F0314 ; case 7 + b _022F03A8 ; case 8 + b _022F032C ; case 9 #else add r0, r5, #0x100 cmp r1, #0 @@ -23816,9 +24082,13 @@ _022F03B0: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -#ifdef EUROPE +#if defined(EUROPE) _022F0D74: .word 0x0000017B _022F0D78: .word 0x0000016B +#elif defined(JAPAN) +_022F1A08: .word 0x00000165 +_022F1A0C_JP: .word 0x00000127 +_022F1A10: .word 0x00000129 #else _022F03B8: .word 0x00000113 _022F03BC: .word 0x00000123 @@ -23877,12 +24147,15 @@ ov11_022F042C: ; 0x022F042C cmp r2, r0 bgt _022F054C bge _022F07FC -#ifdef EUROPE +#if defined(EUROPE) sub r1, r0, #0x4c + cmp r2, r1 +#elif defined(JAPAN) + cmp r2, #0x128 #else sub r1, r0, #0x47 -#endif cmp r2, r1 +#endif bgt _022F04D4 bge _022F0C44 cmp r2, #0x10c @@ -23903,15 +24176,19 @@ _022F0484: beq _022F0AF0 b _022F11C0 _022F04A8: -#ifdef EUROPE +#if defined(EUROPE) sub r1, r0, #0x6a +#elif defined(JAPAN) + sub r1, r0, #0x53 #else sub r1, r0, #0x59 #endif cmp r2, r1 bgt _022F04C4 -#ifdef EUROPE +#if defined(EUROPE) sub r0, r0, #0x6a +#elif defined(JAPAN) + sub r1, r0, #0x53 #else sub r0, r0, #0x59 #endif @@ -23928,24 +24205,32 @@ _022F04C4: beq _022F0C44 b _022F11C0 _022F04D4: -#ifdef EUROPE +#if defined(EUROPE) sub r1, r0, #0x18 -#else - sub r1, r0, #0x13 -#endif cmp r2, r1 bgt _022F0524 bge _022F0634 -#ifdef EUROPE sub r0, r0, #0x46 -#else - sub r0, r0, #0x41 -#endif cmp r2, r0 bgt _022F0514 -#ifdef EUROPE subs r0, r2, #0x130 +#elif defined(JAPAN) + cmp r2, #0x15c + bgt _022F0524 + bge _022F0634 + sub r1, r0, #0x41 + cmp r2, r1 + bgt _022F0514 + sub r0, r0, #0x46 + subs r0, r2, r0 #else + sub r1, r0, #0x13 + cmp r2, r1 + bgt _022F0524 + bge _022F0634 + sub r0, r0, #0x41 + cmp r2, r0 + bgt _022F0514 subs r0, r2, #0x124 #endif addpl pc, pc, r0, lsl #2 @@ -23963,32 +24248,20 @@ _022F0514: beq _022F0700 b _022F11C0 _022F0524: -#ifdef EUROPE +#if defined(EUROPE) cmp r2, #0x16c bgt _022F0540 bge _022F0F04 sub r0, r0, #0x10 -#else - sub r1, r0, #0xb - cmp r2, r1 - bgt _022F0540 - sub r0, r0, #0xb -#endif cmp r2, r0 beq _022F0700 b _022F11C0 _022F0540: -#ifdef EUROPE sub r0, r0, #5 cmp r2, r0 beq _022F07FC -#else - cmp r2, #0x160 - beq _022F0F04 -#endif b _022F11C0 _022F054C: -#ifdef EUROPE cmp r2, #0x1bc bgt _022F05B0 bge _022F0C44 @@ -23998,7 +24271,107 @@ _022F054C: cmp r2, #0x17c bgt _022F0588 beq _022F0700 + b _022F11C0 +_022F0588: + add r0, r0, #0x13 + cmp r2, r0 + beq _022F09F4 + b _022F11C0 +_022F0594: + add r1, r0, #0x36 + cmp r2, r1 + bgt _022F05A4 + add r0, r0, #0x36 + cmp r2, r0 + bge _022F0C44 + cmp r2, #0x1b0 + beq _022F0C44 + b _022F11C0 +_022F05A4: + add r0, r0, #0x40 + cmp r2, r0 + beq _022F0C44 + b _022F11C0 +_022F05B0: + add r1, r0, #0x53 + cmp r2, r1 + bgt _022F05E4 + bge _022F1128 + cmp r2, #0x1cc + bgt _022F05D8 + beq _022F1090 + b _022F11C0 +_022F05D8: + add r0, r0, #0x52 + cmp r2, r0 + beq _022F1090 +#elif defined(JAPAN) + cmp r2, #0x164 + bgt _022F0540 + beq _022F0700 + b _022F11C0 +_022F0540: + sub r0, r0, #0xa + cmp r2, r0 + beq _022F0F04 + b _022F11C0 +_022F054C: + add r1, r0, #0x37 + cmp r2, r1 + bgt _022F1BFC + bge _022F0C44 + add r1, r0, #0x18 + cmp r2, r1 + bgt _022F1BD0 + bge _022F09F4 + cmp r2, #0x174 + bgt _022F1BC0 + beq _022F07FC + b _022F11C0 +_022F1BC0: + add r0, r0, #6 + cmp r2, r0 + beq _022F0700 + b _022F11C0 +_022F1BD0: + add r1, r0, #0x26 + cmp r2, r1 + bgt _022F1BEC + add r0, r0, #0x26 + cmp r2, r0 + beq _022F08F8 + b _022F11C0 +_022F1BEC: + add r0, r0, #0x36 + cmp r2, r0 + beq _022F0C44 + b _022F11C0 +_022F1BFC: + add r1, r0, #0x46 + cmp r2, r1 + bgt _022F05E4 + bge _022F1090 + cmp r2, #0x1b0 + bgt _022F1C1C + beq _022F0C44 + b _022F11C0 +_022F1C1C: + add r0, r0, #0x42 + cmp r2, r0 + beq _022F0C44 #else + sub r1, r0, #0xb + cmp r2, r1 + bgt _022F0540 + sub r0, r0, #0xb + cmp r2, r0 + beq _022F0700 + b _022F11C0 +_022F0540: + cmp r2, #0x160 + beq _022F0F04 + b _022F11C0 +_022F054C: add r1, r0, #0x37 cmp r2, r1 bgt _022F05B0 @@ -24013,53 +24386,21 @@ _022F054C: add r0, r0, #5 cmp r2, r0 beq _022F07FC -#endif b _022F11C0 _022F0588: -#ifdef EUROPE - add r0, r0, #0x13 - cmp r2, r0 - beq _022F09F4 -#else cmp r2, #0x170 beq _022F0700 -#endif b _022F11C0 _022F0594: -#ifdef EUROPE - add r1, r0, #0x36 - cmp r2, r1 - bgt _022F05A4 - add r0, r0, #0x36 - cmp r2, r0 - bge _022F0C44 - cmp r2, #0x1b0 - beq _022F0C44 -#else cmp r2, #0x190 bgt _022F05A4 beq _022F08F8 -#endif b _022F11C0 _022F05A4: -#ifdef EUROPE - add r0, r0, #0x40 - cmp r2, r0 -#else cmp r2, #0x1a0 -#endif beq _022F0C44 b _022F11C0 _022F05B0: -#ifdef EUROPE - add r1, r0, #0x53 - cmp r2, r1 - bgt _022F05E4 - bge _022F1128 - cmp r2, #0x1cc - bgt _022F05D8 - beq _022F1090 -#else cmp r2, #0x1b0 bgt _022F05E4 bge _022F1090 @@ -24069,14 +24410,8 @@ _022F05B0: add r0, r0, #0x41 cmp r2, r0 beq _022F0C44 -#endif b _022F11C0 _022F05D8: -#ifdef EUROPE - add r0, r0, #0x52 - cmp r2, r0 - beq _022F1090 -#else cmp r2, #0x1ac beq _022F0C44 #endif @@ -24109,7 +24444,12 @@ _022F0604: add r1, r0, #0x50 cmp r2, r1 bgt _022F11C0 +#ifdef JAPAN + add r1, r0, #0x4a + cmp r2, r1 +#else cmp r2, #0x1b4 +#endif blt _022F11C0 beq _022F1128 add r1, r0, #0x4c @@ -24882,9 +25222,12 @@ _022F11CC: add sp, sp, #0x80 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -#ifdef EUROPE +#if defined(EUROPE) _022F11D4: .word 0x0000017B _022F11D8: .word 0x00000162 +#elif defined(JAPAN) +_022F11D4: .word 0x0000016F +_022F11D8: .word 0x0000015B #else _022F11D4: .word 0x0000016A _022F11D8: .word 0x00000156 @@ -28206,9 +28549,18 @@ _022F3DB0: ldr r1, [r1, #0x340] bl ov11_023159CC ldr r0, _022F3E48 ; =ov11_02324CE0 +#ifdef JAPAN + mov r3, #2 + ldr r2, [r0] + mov r1, #1 + str r3, [r2] + ldr r0, [r0] + strb r1, [r0, #0x11] +#else mov r1, #2 ldr r0, [r0] str r1, [r0] +#endif bl ov11_022F44F8 _022F3DE0: ldr r0, _022F3E48 ; =ov11_02324CE0 @@ -29088,6 +29440,24 @@ ov11_022F4984: ; 0x022F4984 bx lr arm_func_end ov11_022F4984 +#ifdef JAPAN + arm_func_start ov11_022F5FE8_JP +ov11_022F5FE8_JP: ; 0x022F5FE8 + ldrsh r1, [r0, #0x92] + cmp r1, #0 + bge _022F600C + ldrsh r0, [r0, #0x8c] + cmp r0, #0 + movgt r0, #1 + movle r0, #0 + and r0, r0, #0xff + bx lr +_022F600C: + mov r0, #0 + bx lr + arm_func_end ov11_022F5FE8_JP +#endif + arm_func_start ov11_022F4990 ov11_022F4990: ; 0x022F4990 stmdb sp!, {r3, lr} @@ -37432,11 +37802,16 @@ _022FBA98: mov r0, sl bl ChangeActorAnimation _022FBB20: +#ifdef JAPAN + add r0, sl, #0x18c + bl ov11_022F5FE8_JP +#else add r0, sl, #0x200 ldrsh r1, [r0, #0x1e] cmp r1, #0 bge _022FBB54 ldrsh r0, [r0, #0x18] +#endif cmp r0, #0 ble _022FBB54 strb fp, [sl, #0x174] @@ -39451,7 +39826,11 @@ _022FD540: str r7, [sp, #0x10] ldr r2, [sl, #0x134] ldr r1, [sl, #0x18] +#ifdef JAPAN + add r0, sl, #0x154 +#else add r0, sl, #0x100 +#endif add r1, r2, r1 str r1, [sp, #0xc] ldr r2, [sl, #0x138] @@ -39461,12 +39840,20 @@ _022FD540: ldrsh r1, [r0, #0xe6] ldr r6, [sl, #0x144] ldr r5, [sl, #0x148] +#ifdef JAPAN + bl ov11_022F5FE8_JP + cmp r0, #0 + beq _022FD5B4 + strb fp, [sl, #0x14c] + add r0, sl, #0x100 +#else cmp r1, #0 bge _022FD5B4 ldrsh r1, [r0, #0xe0] cmp r1, #0 ble _022FD5B4 strb fp, [sl, #0x14c] +#endif ldrsh r1, [r0, #0x4e] mov r2, fp add r0, sl, #0x154 @@ -40990,7 +41377,11 @@ _022FE8FC: str r7, [sp, #0x10] ldr r2, [sl, #0x130] ldr r1, [sl, #0x18] +#ifdef JAPAN + add r0, sl, #0x150 +#else add r0, sl, #0x100 +#endif add r1, r2, r1 str r1, [sp, #0xc] ldr r2, [sl, #0x134] @@ -41000,11 +41391,17 @@ _022FE8FC: ldrsh r1, [r0, #0xe2] ldr r6, [sl, #0x140] ldr r5, [sl, #0x144] +#ifdef JAPAN + bl ov11_022F5FE8_JP + cmp r0, #0 + beq _022FE970 +#else cmp r1, #0 bge _022FE970 ldrsh r1, [r0, #0xdc] cmp r1, #0 ble _022FE970 +#endif strb fp, [sl, #0x148] ldrsh r1, [r0, #0x4a] mov r2, fp @@ -41618,10 +42015,15 @@ _022FF118: bl GetMoneyCarried str r0, [sp, #0x28] add r6, sp, #4 +#ifdef JAPAN + ldr r2, _0230083C ; =0x0000042B +#endif ldr r3, _022FF1C8 ; =0x0000C402 add r0, sp, #0x54 mov r1, #0x100 +#ifndef JAPAN mov r2, #0x224 +#endif str r6, [sp] bl PreprocessStringFromId cmp r5, #3 @@ -41671,11 +42073,20 @@ _022FF1B4: add sp, sp, #0x400 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 +#ifdef JAPAN +_022FF1C0: .word 0x00000429 +_022FF1C4: .word 0x00000426 +_022FF1C8: .word 0x0000C402 +_022FF1CC: .word 0x00000428 +_022FF1D0: .word 0x0000042D +_0230083C: .word 0x0000042B +#else _022FF1C0: .word 0x00000222 _022FF1C4: .word 0x0000021F _022FF1C8: .word 0x0000C402 _022FF1CC: .word 0x00000221 _022FF1D0: .word 0x00000226 +#endif arm_func_end UpdateTeamInfoBox arm_func_start ov11_022FF1D4 @@ -41899,10 +42310,17 @@ ov11_022FF490: ; 0x022FF490 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} +#ifdef JAPAN + ldr r0, _022FF4F8 ; =ov11_02324D14 + mov r1, #0x1b4 + strh r1, [r0, #2] + cmp r5, #0 +#else ldr r1, _022FF4F4 ; =0x000001AF ldr r0, _022FF4F8 ; =ov11_02324D14 cmp r5, #0 strh r1, [r0, #2] +#endif bne _022FF4CC ldr r0, _022FF4FC ; =ov11_0238A078 bl ov11_022E45F4 @@ -41921,9 +42339,9 @@ _022FF4E4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022FF4F0: .word ov11_0232249C -#ifdef EUROPE +#if defined(EUROPE) _022FF4F4: .word 0x000001CB -#else +#elif !defined(JAPAN) _022FF4F4: .word 0x000001AF #endif _022FF4F8: .word ov11_02324D14 @@ -41959,17 +42377,24 @@ _022FF558: subs r1, r1, #1 strb r0, [r2], #1 bne _022FF558 +#ifdef JAPAN + ldr r1, _022FF57C ; =ov11_02324D14 + mov r1, #0x1b4 + strh r1, [r0, #2] + mov r0, #1 +#else ldr r2, _022FF584 ; =0x000001AF ldr r1, _022FF57C ; =ov11_02324D14 mov r0, #1 strh r2, [r1, #2] +#endif ldmia sp!, {r3, pc} .align 2, 0 _022FF57C: .word ov11_02324D14 _022FF580: .word ov11_0238A078 -#ifdef EUROPE +#if defined(EUROPE) _022FF584: .word 0x000001CB -#else +#elif !defined(JAPAN) _022FF584: .word 0x000001AF #endif arm_func_end ov11_022FF500 @@ -42033,7 +42458,11 @@ _022FF608: strb r1, [r0] _022FF644: ldr r0, _022FF9E0 ; =ov11_02324D14 +#ifdef JAPAN + mov r1, #0x1b4 +#else ldr r1, _022FF9E4 ; =0x000001AF +#endif ldr r2, [r0, #4] ldr r0, _022FF9E8 ; =ov11_023224AC ldrsh r4, [r2, #0x1c] @@ -42283,9 +42712,9 @@ _022FF9D8: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _022FF9E0: .word ov11_02324D14 -#ifdef EUROPE +#if defined(EUROPE) _022FF9E4: .word 0x000001CB -#else +#elif !defined(JAPAN) _022FF9E4: .word 0x000001AF #endif _022FF9E8: .word ov11_023224AC @@ -42341,10 +42770,16 @@ _022FFA70: subs r2, r2, #1 strb r0, [r1], #1 bne _022FFA70 +#ifdef JAPAN + ldr r0, _022FFAA0 ; =ov11_02324D14 + ldrsh r0, [r0, #2] + cmp r0, #0x1b4 +#else ldr r1, _022FFAA0 ; =ov11_02324D14 ldr r0, _022FFAA8 ; =0x000001AF ldrsh r1, [r1, #2] cmp r1, r0 +#endif movne r0, #1 moveq r0, #0 and r0, r0, #0xff @@ -42352,9 +42787,9 @@ _022FFA70: .align 2, 0 _022FFAA0: .word ov11_02324D14 _022FFAA4: .word ov11_0238A078 -#ifdef EUROPE +#if defined(EUROPE) _022FFAA8: .word 0x000001CB -#else +#elif !defined(JAPAN) _022FFAA8: .word 0x000001AF #endif arm_func_end ov11_022FFA5C @@ -42866,7 +43301,7 @@ _02300178: _0230018C: ldrb r0, [r2, #0xc] cmp r0, #0 - beq ov11_023001F4 + beq _023001F4 bl ov11_0230D220 cmp r0, #0 bne _02300570 @@ -42890,10 +43325,7 @@ _0230018C: ldr r0, [r0, #4] ldrsh r0, [r0, #0xe] bl WorldMapSetCamera - arm_func_end ov11_022FFF00 - - arm_func_start ov11_023001F4 -ov11_023001F4: +_023001F4: ldr r0, _0230057C ; =ov11_02324D1C ldr r0, [r0, #4] ldrsb r0, [r0] @@ -42997,6 +43429,15 @@ _02300340: ldrsh r0, [r0, #0x18] strh r0, [r1, #2] bl DungeonSwapIdxToId +#ifdef JAPAN + ldr r1, _0230057C ; =ov11_02324D1C + ldr r1, _02300590 ; =0x00000408 + ldr r2, [r2, #4] + str r0, [sp, #0x18] + ldrsb r0, [r2, #1] + add r3, sp, #8 + add r2, r1, #0x2e +#else ldr r1, _0230057C ; =ov11_02324D1C str r0, [sp, #0x18] ldr r0, [r1, #4] @@ -43004,6 +43445,7 @@ _02300340: ldrsb r0, [r0, #1] ldr r2, _02300594 ; =0x0000022F add r3, sp, #8 +#endif bl ShowStringIdInDialogueBox _02300398: ldr r1, _0230057C ; =ov11_02324D1C @@ -43141,15 +43583,21 @@ _02300574: ldmia sp!, {r3, pc} .align 2, 0 _0230057C: .word ov11_02324D1C +#ifdef JAPAN +_02300580: .word 0x00000435 +#else _02300580: .word 0x0000022E +#endif _02300584: .word ov11_0232250C _02300588: .word 0x00801833 _0230058C: .word ov11_023005A0 _02300590: .word 0x00000408 +#ifndef JAPAN _02300594: .word 0x0000022F +#endif _02300598: .word 0x00400013 _0230059C: .word ov11_02322530 - arm_func_end ov11_023001F4 + arm_func_end ov11_022FFF00 arm_func_start ov11_023005A0 ov11_023005A0: ; 0x023005A0 @@ -44104,7 +44552,11 @@ ov11_0230119C: ; 0x0230119C ldmia sp!, {r4, pc} .align 2, 0 _0230120C: .word ov11_02324D40 +#ifdef JAPAN +_02301210: .word 0x0000042E +#else _02301210: .word 0x00000227 +#endif _02301214: .word ov11_023226B4 _02301218: .word 0x00001813 _0230121C: .word ov11_023226D4 @@ -44508,12 +44960,21 @@ _02301780: ldr r0, [r3] mov r1, #0 str r1, [r0, #4] +#ifdef JAPAN + ldr r1, [r3] + ldr r2, _02303080 ; =0x00003288 + add r0, r1, #0x200 + add r3, r1, #0x188 + ldrsb r0, [r0, #0x54] + mov r1, #0x18 +#else ldr r2, [r3] mov r1, #0x18 add r0, r2, #0x200 ldrsb r0, [r0, #0x54] add r3, r2, #0x188 mov r2, #0x3a4 +#endif bl ShowStringIdInDialogueBox ldmia sp!, {r3, pc} _023017B4: @@ -44679,13 +45140,24 @@ _02301A04: ldmia sp!, {r3, pc} .align 2, 0 _02301A10: .word ov11_02324D48 +#ifdef JAPAN +_02301A14: .word 0x00002479 +#else _02301A14: .word 0x000002A5 +#endif _02301A18: .word ov11_023226FC _02301A1C: .word 0x00300011 _02301A20: .word ov11_0232271C +#ifdef JAPAN +_02301A24: .word 0x00003273 +_02301A28: .word ov11_023226F4 +_02303080: .word 0x00003288 +_02301A2C: .word 0x00003287 +#else _02301A24: .word 0x0000038F _02301A28: .word ov11_023226F4 _02301A2C: .word 0x000003A3 +#endif arm_func_end ov11_023014AC arm_func_start ov11_02301A30 @@ -44888,12 +45360,21 @@ _02301CFC: ldr r1, [r0] mov r2, #0 str r2, [r1, #4] +#ifdef JAPAN + ldr r1, [r0] + ldr r2, _02303600 ; =0x00003288 + add r0, r1, #0x200 + add r3, r1, #0x188 + ldrsb r0, [r0, #0x54] + mov r1, #0x18 +#else ldr r2, [r0] mov r1, #0x18 add r0, r2, #0x200 add r3, r2, #0x188 ldrsb r0, [r0, #0x54] mov r2, #0x3a4 +#endif bl ShowStringIdInDialogueBox ldmia sp!, {r3, pc} _02301D30: @@ -45059,13 +45540,24 @@ _02301F80: ldmia sp!, {r3, pc} .align 2, 0 _02301F8C: .word ov11_02324D48 +#ifdef JAPAN +_02301F90: .word 0x00002479 +#else _02301F90: .word 0x000002A5 +#endif _02301F94: .word ov11_023226FC _02301F98: .word 0x00300011 _02301F9C: .word ov11_0232271C +#ifdef JAPAN +_02301FA0: .word 0x00003273 +_02301FA4: .word ov11_023226F4 +_02303600: .word 0x00003288 +_02301FA8: .word 0x00003287 +#else _02301FA0: .word 0x0000038F _02301FA4: .word ov11_023226F4 _02301FA8: .word 0x000003A3 +#endif arm_func_end ov11_02301A30 arm_func_start ov11_02301FAC @@ -45694,8 +46186,13 @@ _0230283C: ldmia sp!, {r3, pc} .align 2, 0 _02302844: .word ov11_02324D4C +#ifdef JAPAN +_02302848: .word 0x0000244A +_0230284C: .word 0x0000245B +#else _02302848: .word 0x00000276 _0230284C: .word 0x00000287 +#endif arm_func_end ov11_02302668 arm_func_start ov11_02302850 @@ -46122,8 +46619,13 @@ _02302DB4: .word ov11_02324D4C ov11_02302DB8: ; 0x02302DB8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} ldr sb, _023031E4 ; =ov11_02324D4C +#ifdef JAPAN + ldr r1, [sb, #4] + ldr r0, [r1] +#else ldr r3, [sb, #4] ldr r0, [r3] +#endif cmp r0, #0xd addls pc, pc, r0, lsl #2 b _023031DC @@ -46143,8 +46645,13 @@ _02302DD4: ; jump table b _023031A4 ; case 12 b _023031C0 ; case 13 _02302E0C: +#ifdef JAPAN + add r0, r1, #0x3c + str r0, [r1, #0x174] +#else add r0, r3, #0x3c str r0, [r3, #0x174] +#endif ldr r1, [sb, #4] mvn r0, #1 ldrsb r1, [r1, #9] @@ -46160,7 +46667,11 @@ _02302E0C: str r2, [r0] b _023031DC _02302E4C: +#ifdef JAPAN + ldrsb r0, [r1, #9] +#else ldrsb r0, [r3, #9] +#endif ldr r2, _023031E8 ; =0x000002C5 mov r1, #0x10 mov r3, #0 @@ -46171,7 +46682,11 @@ _02302E4C: str r1, [r0] b _023031DC _02302E74: +#ifdef JAPAN + ldrsb r0, [r1, #9] +#else ldrsb r0, [r3, #9] +#endif bl IsDialogueBoxActive cmp r0, #0 bne _023031DC @@ -46185,10 +46700,17 @@ _02302E74: str r1, [r0] b _023031DC _02302EA8: +#ifdef JAPAN + add r0, r1, #0x3c + mov r7, #0 + ldr r5, _023031EC ; =ov11_02322780 + str r0, [r1, #0x174] +#else add r0, r3, #0x3c mov r7, #0 ldr r5, _023031EC ; =ov11_02322780 str r0, [r3, #0x174] +#endif mov r6, #0x100 mov r4, r7 _02302EC0: @@ -46228,7 +46750,11 @@ _02302EC0: str r2, [r0] b _023031DC _02302F4C: +#ifdef JAPAN + ldrsb r0, [r1, #0xa] +#else ldrsb r0, [r3, #0xa] +#endif bl IsSimpleMenuActive cmp r0, #0 bne _023031DC @@ -46274,9 +46800,15 @@ _02302FE8: str r0, [r1] b _023031DC _02302FF4: +#ifdef JAPAN + ldrsb r0, [r1, #9] + ldr r2, _023031F8 ; =0x000002C9 + add r3, r1, #0x13c +#else ldrsb r0, [r3, #9] ldr r2, _023031F8 ; =0x000002C9 add r3, r3, #0x13c +#endif mov r1, #0x10 bl ShowStringIdInDialogueBox mov r0, sb @@ -46285,7 +46817,11 @@ _02302FF4: str r1, [r0] b _023031DC _0230301C: +#ifdef JAPAN + ldrsb r0, [r1, #9] +#else ldrsb r0, [r3, #9] +#endif bl IsDialogueBoxActive cmp r0, #0 bne _023031DC @@ -46314,7 +46850,11 @@ _02303050: str r2, [r0] b _023031DC _02303088: +#ifdef JAPAN + ldrsb r0, [r1, #0xa] +#else ldrsb r0, [r3, #0xa] +#endif bl IsSimpleMenuActive cmp r0, #0 bne _023031DC @@ -46344,10 +46884,17 @@ _023030E8: str r0, [r1] b _023031DC _023030F4: +#ifdef JAPAN + ldrsb r0, [r1, #9] + ldr r2, _02304864_JP ; =0x00002FEA + add r3, r1, #0x13c + mov r1, #0x218 +#else ldrsb r0, [r3, #9] mov r1, #0x218 add r2, r1, #0xb2 add r3, r3, #0x13c +#endif bl ShowStringIdInDialogueBox mov r0, sb ldr r0, [r0, #4] @@ -46355,7 +46902,11 @@ _023030F4: str r1, [r0] b _023031DC _0230311C: +#ifdef JAPAN + ldrsb r0, [r1, #9] +#else ldrsb r0, [r3, #9] +#endif bl IsDialogueBoxActive cmp r0, #0 moveq r0, sb @@ -46364,7 +46915,11 @@ _0230311C: streq r1, [r0] b _023031DC _0230313C: +#ifdef JAPAN + add r0, r1, #0x10 +#else add r0, r3, #0x10 +#endif bl sub_0206351C mov r0, sb ldr r1, [r0, #4] @@ -46411,14 +46966,25 @@ _023031DC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _023031E4: .word ov11_02324D4C +#ifdef JAPAN +_023031E8: .word 0x00002FE5 +#else _023031E8: .word 0x000002C5 +#endif _023031EC: .word ov11_02322780 _023031F0: .word ov11_02322750 _023031F4: .word 0x00300011 +#ifdef JAPAN +_023031F8: .word 0x00002FE9 +#else _023031F8: .word 0x000002C9 +#endif _023031FC: .word ov11_02322760 _02303200: .word 0x00300013 _02303204: .word ov11_02322798 +#ifdef JAPAN +_02304864_JP: .word 0x00002FEA +#endif arm_func_end ov11_02302DB8 arm_func_start ov11_02303208 @@ -46513,6 +47079,15 @@ ov11_023032C4: ; 0x023032C4 add r0, r0, #0xc00 bl InitPreprocessorArgs ldr r0, _023033F0 ; =ov11_02324D54 +#ifdef JAPAN + ldr r2, _02304A54 ; =0x000032FC + ldr r1, [r0] + ldr r3, _023033F4 ; =0x0000C402 + add r0, r1, #0x28 + add r4, r0, #0xc00 + add r0, r1, #0x24 + mov r1, #0x400 +#else mov r1, #0x400 ldr r2, [r0] ldr r3, _023033F4 ; =0x0000C402 @@ -46520,6 +47095,7 @@ ov11_023032C4: ; 0x023032C4 add r4, r0, #0xc00 add r0, r2, #0x24 add r2, r1, #0x4a +#endif str r4, [sp] bl PreprocessStringFromId ldr r6, _023033F8 ; =ov11_023227B0 @@ -46554,6 +47130,9 @@ _02303390: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _023033F0: .word ov11_02324D54 +#ifdef JAPAN +_02304A54: .word 0x000032FC +#endif _023033F4: .word 0x0000C402 _023033F8: .word ov11_023227B0 arm_func_end ov11_023032C4 @@ -46712,8 +47291,13 @@ _023035E8: ; jump table _02303618: ldr r0, [r3, #4] mov r1, #0 +#ifdef JAPAN + add r0, r0, #0xfe + add r2, r0, #0x3200 +#else add r0, r0, #0x4c add r2, r0, #0x400 +#endif mov r0, #0x10 strh r2, [sp, #0x10] str r1, [sp, #0x7c] @@ -46841,8 +47425,13 @@ _0230379C: ; jump table _023037CC: ldr r0, [r3, #4] mov r1, #0 +#ifdef JAPAN + add r0, r0, #0xfe + add r2, r0, #0x3200 +#else add r0, r0, #0x4c add r2, r0, #0x400 +#endif mov r0, #0x10 strh r2, [sp, #0x10] str r1, [sp, #0x7c] @@ -47262,8 +47851,10 @@ _02303D4C: ldmia sp!, {r3, pc} .align 2, 0 _02303D68: .word ov11_02324D58 -#ifdef EUROPE +#if defined(EUROPE) _02303D6C: .word 0x00003D01 +#elif defined(JAPAN) +_02303D6C: .word 0x000004A6 #else _02303D6C: .word 0x00003CFF #endif @@ -48638,7 +49229,11 @@ _02304EDC: ldr r0, _02305444 ; =ov11_02324D84 mov r3, #3 ldr r1, [r0] +#ifdef JAPAN + ldr r2, _02306AB0 ; =0x00002FB1 +#else rsb r2, r3, #0x2e0 +#endif str r3, [r1, #0x3c] ldr r3, [r0] mov r1, #8 @@ -48647,8 +49242,13 @@ _02304EDC: bl ShowStringIdInDialogueBox b _0230543C _02304F24: +#ifdef JAPAN + ldr r1, _02306AB4 ; =0x00002FAC + add r0, r4, #0x1b0 +#else add r0, r4, #0x1b0 mov r1, #0x2d8 +#endif bl GetStringFromFileVeneer mov r1, #2 add r0, sp, #0x18 @@ -48730,10 +49330,17 @@ _02304FE4: ldr r0, _02305444 ; =ov11_02324D84 mov r4, #0x15 ldr r3, [r0] +#ifdef JAPAN + ldr r2, _02306AC0 ; =0x00002FC5 + str r4, [r3, #0x3c] + ldr r3, [r0] + mov r1, #8 +#else mov r1, #8 str r4, [r3, #0x3c] ldr r3, [r0] add r2, r4, #0x2bc +#endif ldrsb r0, [r3, #0x48] add r3, r3, #0x15c bl ShowStringIdInDialogueBox @@ -48773,12 +49380,16 @@ _023050BC: add ip, r4, #0x15c str ip, [sp] ldrsh r4, [r4, #0x58] -#ifdef EUROPE +#if defined(EUROPE) add r4, r4, #0xd3 + add r4, r4, #0x2900 +#elif defined(JAPAN) + add r4, r4, #0xce + add r4, r4, #0x4100 #else add r4, r4, #0xd1 -#endif add r4, r4, #0x2900 +#endif mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, ip} @@ -48995,23 +49606,39 @@ _0230543C: add sp, sp, #0x198 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 +#ifdef JAPAN +#define OV11_02304DC8_OFFSET 0x2CD4 +#else +#define OV11_02304DC8_OFFSET 0 +#endif _02305444: .word ov11_02324D84 -_02305448: .word 0x000002D7 +_02305448: .word 0x000002D7 + OV11_02304DC8_OFFSET +#ifdef JAPAN +_02306AB0: .word 0x00002FB1 +_02306AB4: .word 0x00002FAC +#endif _0230544C: .word ov11_02322B8C -_02305450: .word 0x000002D9 +_02305450: .word 0x000002D9 + OV11_02304DC8_OFFSET +#ifdef JAPAN +_02306AC0: .word 0x00002FC5 +#endif _02305454: .word ov11_02322B98 _02305458: .word 0x00300033 _0230545C: .word ov11_02322BC8 _02305460: .word ov11_02322BA8 _02305464: .word 0x00001013 +#ifdef JAPAN +_02305468: .word 0x00001D3C +#else _02305468: .word 0x000008E4 -_0230546C: .word 0x000002DF -_02305470: .word 0x000002D6 -_02305474: .word 0x000002DE +#endif +_0230546C: .word 0x000002DF + OV11_02304DC8_OFFSET +_02305470: .word 0x000002D6 + OV11_02304DC8_OFFSET +_02305474: .word 0x000002DE + OV11_02304DC8_OFFSET _02305478: .word ov11_02322BB8 _0230547C: .word ov11_02322BE0 _02305480: .word ov11_02304D94 -_02305484: .word 0x000002DA +_02305484: .word 0x000002DA + OV11_02304DC8_OFFSET arm_func_end ov11_02304DC8 arm_func_start ov11_02305488 @@ -49099,7 +49726,11 @@ _02305594: ldr r0, _02305AFC ; =ov11_02324D84 mov r3, #3 ldr r1, [r0] +#ifdef JAPAN + ldr r2, _02307174 ; =0x00002FB1 +#else rsb r2, r3, #0x2e0 +#endif str r3, [r1, #0x3c] ldr r3, [r0] mov r1, #8 @@ -49108,8 +49739,13 @@ _02305594: bl ShowStringIdInDialogueBox b _02305AF4 _023055DC: +#ifdef JAPAN + ldr r1, _02307178 ; =0x00002FAC + add r0, r4, #0x1b0 +#else add r0, r4, #0x1b0 mov r1, #0x2d8 +#endif bl GetStringFromFileVeneer mov r1, #2 add r0, sp, #0x148 @@ -49191,10 +49827,17 @@ _0230569C: ldr r0, _02305AFC ; =ov11_02324D84 mov r4, #0x15 ldr r3, [r0] +#ifdef JAPAN + ldr r2, _02307184 ; =0x00002FC5 + str r4, [r3, #0x3c] + ldr r3, [r0] + mov r1, #8 +#else mov r1, #8 str r4, [r3, #0x3c] ldr r3, [r0] add r2, r4, #0x2bc +#endif ldrsb r0, [r3, #0x48] add r3, r3, #0x15c bl ShowStringIdInDialogueBox @@ -49234,12 +49877,16 @@ _02305774: add ip, r4, #0x15c str ip, [sp] ldrsh r4, [r4, #0x58] -#ifdef EUROPE +#if defined(EUROPE) add r4, r4, #0xd3 + add r4, r4, #0x2900 +#elif defined(JAPAN) + add r4, r4, #0xce + add r4, r4, #0x4100 #else add r4, r4, #0xd1 -#endif add r4, r4, #0x2900 +#endif mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, ip} @@ -49456,23 +50103,39 @@ _02305AF4: add sp, sp, #0x198 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 +#ifdef JAPAN +#define OV11_02305488_OFFSET 0x2CD4 +#else +#define OV11_02305488_OFFSET 0 +#endif _02305AFC: .word ov11_02324D84 -_02305B00: .word 0x000002D7 +_02305B00: .word 0x000002D7 + OV11_02305488_OFFSET +#ifdef JAPAN +_02307174: .word 0x00002FB1 +_02307178: .word 0x00002FAC +#endif _02305B04: .word ov11_02322B8C -_02305B08: .word 0x000002D9 +_02305B08: .word 0x000002D9 + OV11_02305488_OFFSET +#ifdef JAPAN +_02307184: .word 0x00002FC5 +#endif _02305B0C: .word ov11_02322B98 _02305B10: .word 0x00300033 _02305B14: .word ov11_02322BC8 _02305B18: .word ov11_02322BA8 _02305B1C: .word 0x00001013 +#ifdef JAPAN +_02305B20: .word 0x00001D3C +#else _02305B20: .word 0x000008E4 -_02305B24: .word 0x000002DF -_02305B28: .word 0x000002D6 -_02305B2C: .word 0x000002DE +#endif +_02305B24: .word 0x000002DF + OV11_02305488_OFFSET +_02305B28: .word 0x000002D6 + OV11_02305488_OFFSET +_02305B2C: .word 0x000002DE + OV11_02305488_OFFSET _02305B30: .word ov11_02322BB8 _02305B34: .word ov11_02322BE0 _02305B38: .word ov11_02304D94 -_02305B3C: .word 0x000002DA +_02305B3C: .word 0x000002DA + OV11_02305488_OFFSET arm_func_end ov11_02305488 arm_func_start ov11_02305B40 @@ -49955,9 +50618,14 @@ _023061C8: .word ov11_02324D84 arm_func_start ov11_023061CC ov11_023061CC: ; 0x023061CC ldr ip, _023061E0 ; =ov11_023061FC +#ifdef JAPAN + mov r1, #0 + mov r2, #1 +#else mov r2, #1 mov r3, r2 mov r1, #3 +#endif bx ip .align 2, 0 _023061E0: .word ov11_023061FC @@ -49968,7 +50636,9 @@ ov11_023061E4: ; 0x023061E4 ldr ip, _023061F8 ; =ov11_023061FC mov r2, r1 mov r1, #3 +#ifndef JAPAN mov r3, #0 +#endif bx ip .align 2, 0 _023061F8: .word ov11_023061FC @@ -49976,6 +50646,19 @@ _023061F8: .word ov11_023061FC arm_func_start ov11_023061FC ov11_023061FC: ; 0x023061FC +#ifdef JAPAN +#define OV11_023061FC_OFFSET -4 +#else +#define OV11_023061FC_OFFSET 0 +#endif +#ifdef JAPAN + stmdb sp!, {r4, r5, r6, lr} + ldr r3, _023062B8 ; =ov11_02324D88 + mov r6, r0 + ldr r0, [r3] + mov r5, r1 + mov r4, r2 +#else stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r4, _023062B8 ; =ov11_02324D88 mov r7, r0 @@ -49983,9 +50666,10 @@ ov11_023061FC: ; 0x023061FC mov r6, r1 mov r5, r2 mov r4, r3 +#endif cmp r0, #0 bne _02306234 - mov r0, #0x124 + mov r0, #0x124 + OV11_023061FC_OFFSET mov r1, #8 bl MemAlloc ldr r1, _023062B8 ; =ov11_02324D88 @@ -49994,6 +50678,13 @@ _02306234: ldr r0, _023062B8 ; =ov11_02324D88 mov r2, #0 ldr r1, [r0] +#ifdef JAPAN + str r5, [r1, #0x84] + ldr r1, [r0] + strb r4, [r1, #0x20] + ldr r1, [r0] + str r6, [r1] +#else str r4, [r1, #0x24] ldr r1, [r0] str r6, [r1, #0x88] @@ -50001,35 +50692,45 @@ _02306234: strb r5, [r1, #0x20] ldr r1, [r0] str r7, [r1] +#endif ldr r1, [r0] str r2, [r1, #8] ldr r0, [r0] - add r0, r0, #0x30 + add r0, r0, #0x30 + OV11_023061FC_OFFSET bl InitPreprocessorArgs ldr r1, _023062B8 ; =ov11_02324D88 mov r0, #0 ldr r2, [r1] sub r3, r0, #2 - str r0, [r2, #0x7c] + str r0, [r2, #0x7c + OV11_023061FC_OFFSET] ldr r2, [r1] - str r0, [r2, #0x30] + str r0, [r2, #0x30 + OV11_023061FC_OFFSET] ldr r2, [r1] - str r0, [r2, #0x28] + str r0, [r2, #0x28 + OV11_023061FC_OFFSET] ldr r2, [r1] strb r3, [r2, #0x21] ldr r2, [r1] strb r3, [r2, #0x22] ldr r1, [r1] - str r0, [r1, #0x80] + str r0, [r1, #0x80 + OV11_023061FC_OFFSET] bl ov11_023062BC mov r0, #1 +#ifdef JAPAN + ldmia sp!, {r4, r5, r6, pc} +#else ldmia sp!, {r3, r4, r5, r6, r7, pc} +#endif .align 2, 0 _023062B8: .word ov11_02324D88 arm_func_end ov11_023061FC arm_func_start ov11_023062BC ov11_023062BC: ; 0x023062BC +#ifdef JAPAN +#define OV11_023062BC_OFFSET -4 +#else +#define OV11_023062BC_OFFSET 0 +#endif stmdb sp!, {r3, r4, lr} sub sp, sp, #0x7c ldr r1, _02306768 ; =ov11_02324D88 @@ -50091,11 +50792,17 @@ _02306388: str r1, [r0, #0x14] bl ov11_0230720C ldr r0, _02306768 ; =ov11_02324D88 +#ifdef JAPAN + ldr r2, _02307D74 ; =0x00002FB4 + ldr r3, [r0] + mov r1, #8 +#else mov r1, #8 ldr r3, [r0] mov r2, #0x2e0 +#endif ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_023062BC_OFFSET bl ShowStringIdInDialogueBox b _02306760 _023063BC: @@ -50109,12 +50816,16 @@ _023063BC: ldr r0, _02306768 ; =ov11_02324D88 mov r3, #3 ldr r1, [r0] +#ifdef JAPAN + rsb r2, r3, #0x2fc0 +#else rsb r2, r3, #0x2ec +#endif str r3, [r1, #0x14] ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_023062BC_OFFSET bl ShowStringIdInDialogueBox b _02306760 _02306404: @@ -50140,7 +50851,7 @@ _02306430: ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_023062BC_OFFSET bl ShowStringIdInDialogueBox ldr r0, _02306768 ; =ov11_02324D88 mov r1, #5 @@ -50149,14 +50860,14 @@ _02306430: b _02306760 _02306474: mov r0, #3 - str r0, [r2, #0x8c] + str r0, [r2, #0x8c + OV11_023062BC_OFFSET] mov r0, #2 str r0, [sp] ldr r2, [r1] ldr r0, _0230676C ; =ov11_02322C10 ldr r1, _0230677C ; =0x00300031 ldr r3, _02306780 ; =ov11_02322C20 - add r2, r2, #0x8c + add r2, r2, #0x8c + OV11_023062BC_OFFSET bl CreateSimpleMenuFromStringIds ldr r1, _02306768 ; =ov11_02324D88 mov r2, #6 @@ -50206,17 +50917,23 @@ _02306538: mov r3, #0xa ldr r2, [r0] mov r1, #7 - str r3, [r2, #0x2c] + str r3, [r2, #0x2c + OV11_023062BC_OFFSET] ldr r0, [r0] str r1, [r0, #0x14] bl ov11_0230720C ldr r0, _02306768 ; =ov11_02324D88 +#ifdef JAPAN + ldr r2, _02307D90_JP ; =0x00002FB8 + ldr ip, [r0] + mov r1, #0x218 +#else mov r1, #0x218 ldr ip, [r0] mov r2, #0x2e4 +#endif ldr r3, [ip, #4] ldrsh r3, [r3, #4] - str r3, [ip, #0x30] + str r3, [ip, #0x30 + OV11_023062BC_OFFSET] ldr r3, [r0] ldrsb r0, [r3, #0x21] add r3, r3, #0x30 @@ -50225,7 +50942,9 @@ _02306538: ldr r0, [r0] ldrsh r0, [r0, #0xc] bl sub_02055B20 +#ifndef JAPAN bl sub_0203AF0C +#endif bl sub_02057180 ldr r0, _02306768 ; =ov11_02324D88 ldr r1, [r0] @@ -50278,13 +50997,19 @@ _0230663C: ldr r1, _02306768 ; =ov11_02324D88 add r0, sp, #4 ldr r1, [r1] - ldr r1, [r1, #0x88] + ldr r1, [r1, #0x88 + OV11_023062BC_OFFSET] bl sub_0203F150 ldr r1, _02306768 ; =ov11_02324D88 ldr r1, [r1] - strb r0, [r1, #0x84] + strb r0, [r1, #0x84 + OV11_023062BC_OFFSET] b _02306760 _0230666C: +#ifdef JAPAN + ldr r0, _0230678C ; =TEAM_MEMBER_TABLE_PTR + ldrsh r2, [r2, #0xc] + ldr r1, [r0] + mov r0, #0x44 +#else ldr r0, [r2, #0x24] cmp r0, #0 bne _023066C0 @@ -50314,10 +51039,14 @@ _023066C0: ldrsh r2, [r2, #0xc] mov r0, #0x44 mov r3, #0 +#endif smlabb r1, r2, r0, r1 ldrsh r0, [r1, #4] ldrsh r2, [r1, #8] add r1, r1, #0x14 +#ifdef JAPAN + mov r3, #0 +#endif bl PrintIqSkillsMenu b _02306760 _023066F4: @@ -50348,27 +51077,46 @@ _0230672C: ldr r3, [r0] mov r1, #0x18 ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_023062BC_OFFSET bl ShowStringIdInDialogueBox _02306760: add sp, sp, #0x7c ldmia sp!, {r3, r4, pc} .align 2, 0 _02306768: .word ov11_02324D88 +#ifdef JAPAN +_02307D74: .word 0x00002FB4 +#endif _0230676C: .word ov11_02322C10 _02306770: .word 0x00300011 _02306774: .word ov11_02322C38 +#ifdef JAPAN +_02306778: .word 0x00002FBE +#else _02306778: .word 0x000002EA +#endif _0230677C: .word 0x00300031 _02306780: .word ov11_02322C20 +#ifdef JAPAN +_02307D90_JP: .word 0x00002FB8 +#endif _02306784: .word ov11_02322C00 _02306788: .word ov11_02322C50 _0230678C: .word TEAM_MEMBER_TABLE_PTR +#ifdef JAPAN +_02306790: .word 0x00002FB7 +#else _02306790: .word 0x000002E3 +#endif arm_func_end ov11_023062BC arm_func_start ov11_02306794 ov11_02306794: ; 0x02306794 +#ifdef JAPAN +#define OV11_02306794_OFFSET -4 +#else +#define OV11_02306794_OFFSET 0 +#endif stmdb sp!, {r3, r4, lr} sub sp, sp, #0x7c ldr r0, _02306C38 ; =ov11_02324D88 @@ -50428,11 +51176,17 @@ _02306858: str r1, [r0, #0x14] bl ov11_0230720C ldr r0, _02306C38 ; =ov11_02324D88 +#ifdef JAPAN + ldr r2, _023081EC ; =0x00002FB4 + ldr r3, [r0] + mov r1, #8 +#else mov r1, #8 ldr r3, [r0] mov r2, #0x2e0 +#endif ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_02306794_OFFSET bl ShowStringIdInDialogueBox b _02306C30 _0230688C: @@ -50446,12 +51200,16 @@ _0230688C: ldr r0, _02306C38 ; =ov11_02324D88 mov r3, #3 ldr r1, [r0] +#ifdef JAPAN + rsb r2, r3, #0x2fc0 +#else rsb r2, r3, #0x2ec +#endif str r3, [r1, #0x14] ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_02306794_OFFSET bl ShowStringIdInDialogueBox b _02306C30 _023068D4: @@ -50477,7 +51235,7 @@ _02306900: ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_02306794_OFFSET bl ShowStringIdInDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 mov r1, #5 @@ -50486,14 +51244,14 @@ _02306900: b _02306C30 _02306944: mov r1, #3 - str r1, [r2, #0x8c] + str r1, [r2, #0x8c + OV11_02306794_OFFSET] mov r1, #2 str r1, [sp] ldr r2, [r0] ldr r0, _02306C3C ; =ov11_02322C10 ldr r1, _02306C4C ; =0x00300031 ldr r3, _02306C50 ; =ov11_02322C20 - add r2, r2, #0x8c + add r2, r2, #0x8c + OV11_02306794_OFFSET bl CreateSimpleMenuFromStringIds ldr r1, _02306C38 ; =ov11_02324D88 mov r2, #6 @@ -50543,26 +51301,34 @@ _02306A08: mov r3, #0xa ldr r2, [r0] mov r1, #7 - str r3, [r2, #0x2c] + str r3, [r2, #0x2c + OV11_02306794_OFFSET] ldr r0, [r0] str r1, [r0, #0x14] bl ov11_0230720C ldr r0, _02306C38 ; =ov11_02324D88 +#ifdef JAPAN + ldr r2, _02308208 ; =0x00002FB8 + ldr ip, [r0] + mov r1, #0x218 +#else mov r1, #0x218 ldr ip, [r0] mov r2, #0x2e4 +#endif ldr r3, [ip, #4] ldrsh r3, [r3, #4] - str r3, [ip, #0x30] + str r3, [ip, #0x30 + OV11_02306794_OFFSET] ldr r3, [r0] ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_02306794_OFFSET bl ShowStringIdInDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 ldr r0, [r0] ldrsh r0, [r0, #0xc] bl sub_02055B20 +#ifndef JAPAN bl sub_0203AF0C +#endif bl sub_02057180 ldr r0, _02306C38 ; =ov11_02324D88 ldr r1, [r0] @@ -50615,13 +51381,19 @@ _02306B0C: ldr r1, _02306C38 ; =ov11_02324D88 add r0, sp, #4 ldr r1, [r1] - ldr r1, [r1, #0x88] + ldr r1, [r1, #0x88 + OV11_02306794_OFFSET] bl sub_0203F150 ldr r1, _02306C38 ; =ov11_02324D88 ldr r1, [r1] - strb r0, [r1, #0x84] + strb r0, [r1, #0x84 + OV11_02306794_OFFSET] b _02306C30 _02306B3C: +#ifdef JAPAN + ldr r0, _02306C38 ; =ov11_02324D88 + ldrsh r2, [r2, #0xc] + ldr r1, [r0] + mov r0, #0x44 +#else ldr r0, [r2, #0x24] cmp r0, #0 bne _02306B90 @@ -50651,10 +51423,14 @@ _02306B90: ldrsh r2, [r2, #0xc] mov r0, #0x44 mov r3, #0 +#endif smlabb r1, r2, r0, r1 ldrsh r0, [r1, #4] ldrsh r2, [r1, #8] add r1, r1, #0x14 +#ifdef JAPAN + mov r3, #0 +#endif bl PrintIqSkillsMenu b _02306C30 _02306BC4: @@ -50685,23 +51461,37 @@ _02306BFC: ldr r3, [r0] mov r1, #0x18 ldrsb r0, [r3, #0x21] - add r3, r3, #0x30 + add r3, r3, #0x30 + OV11_02306794_OFFSET bl ShowStringIdInDialogueBox _02306C30: add sp, sp, #0x7c ldmia sp!, {r3, r4, pc} .align 2, 0 _02306C38: .word ov11_02324D88 +#ifdef JAPAN +_023081EC: .word 0x00002FB4 +#endif _02306C3C: .word ov11_02322C10 _02306C40: .word 0x00300011 _02306C44: .word ov11_02322C38 +#ifdef JAPAN +_02306C48: .word 0x00002FBE +#else _02306C48: .word 0x000002EA +#endif _02306C4C: .word 0x00300031 _02306C50: .word ov11_02322C20 +#ifdef JAPAN +_02308208: .word 0x00002FB8 +#endif _02306C54: .word ov11_02322C00 _02306C58: .word ov11_02322C50 _02306C5C: .word TEAM_MEMBER_TABLE_PTR +#ifdef JAPAN +_02306C60: .word 0x00002FB7 +#else _02306C60: .word 0x000002E3 +#endif arm_func_end ov11_02306794 arm_func_start ov11_02306C64 @@ -50726,10 +51516,15 @@ _02306C98: .word ov11_02324D88 arm_func_start ov11_02306C9C ov11_02306C9C: ; 0x02306C9C +#ifdef JAPAN +#define OV11_02306C9C_OFFSET -4 +#else +#define OV11_02306C9C_OFFSET 0 +#endif stmdb sp!, {r3, lr} ldr r0, _023071C0 ; =ov11_02324D88 ldr r2, [r0] - ldr r1, [r2, #0x28] + ldr r1, [r2, #0x28 + OV11_02306C9C_OFFSET] cmp r1, #3 addls pc, pc, r1, lsl #2 b _023071B8 @@ -50740,7 +51535,7 @@ _02306CB8: ; jump table b _023071B0 ; case 3 _02306CC8: mov r0, #1 - str r0, [r2, #0x28] + str r0, [r2, #0x28 + OV11_02306C9C_OFFSET] b _023071B8 _02306CD4: ldr r0, [r2, #0x10] @@ -50811,7 +51606,7 @@ _02306DA0: strb r3, [r1, #0x21] ldr r1, [r0] mov r0, #0xd - str r2, [r1, #0x2c] + str r2, [r1, #0x2c + OV11_02306C9C_OFFSET] bl ov11_023062BC b _02307120 _02306DDC: @@ -50959,14 +51754,14 @@ _02306FDC: bne _02307120 ldr r0, _023071C0 ; =ov11_02324D88 ldr r0, [r0] - ldrsb r0, [r0, #0x84] + ldrsb r0, [r0, #0x84 + OV11_02306C9C_OFFSET] bl sub_0202836C bl sub_0203F990 ldr r0, _023071C0 ; =ov11_02324D88 mvn r2, #1 ldr r1, [r0] mov r0, #0x10 - strb r2, [r1, #0x84] + strb r2, [r1, #0x84 + OV11_02306C9C_OFFSET] bl ov11_023062BC b _02307120 _02307018: @@ -50974,6 +51769,7 @@ _02307018: cmp r0, #1 bne _02307120 bl sub_020420F4 +#ifndef JAPAN ldr r0, _023071C0 ; =ov11_02324D88 ldr r0, [r0] ldr r0, [r0, #0x24] @@ -50982,6 +51778,7 @@ _02307018: bl sub_0205633C cmp r0, #0 bne _0230704C +#endif bl sub_020572EC _0230704C: mov r0, #0x10 @@ -51028,18 +51825,18 @@ _023070B0: bl ov11_023062BC b _02307120 _023070E4: - ldr r1, [r2, #0x2c] + ldr r1, [r2, #0x2c + OV11_02306C9C_OFFSET] sub r0, r1, #1 - str r0, [r2, #0x2c] + str r0, [r2, #0x2c + OV11_02306C9C_OFFSET] cmp r1, #0 bgt _02307120 mov r0, #8 bl ov11_023062BC b _02307120 _02307104: - ldr r1, [r2, #0x2c] + ldr r1, [r2, #0x2c + OV11_02306C9C_OFFSET] sub r0, r1, #1 - str r0, [r2, #0x2c] + str r0, [r2, #0x2c + OV11_02306C9C_OFFSET] cmp r1, #0 bgt _02307120 mov r0, #0xe @@ -51049,19 +51846,19 @@ _02307120: _02307124: ldr r0, _023071C0 ; =ov11_02324D88 ldr r1, [r0] - str r2, [r1, #0x80] + str r2, [r1, #0x80 + OV11_02306C9C_OFFSET] ldr r2, [r0] - ldr r1, [r2, #0x80] + ldr r1, [r2, #0x80 + OV11_02306C9C_OFFSET] cmp r1, #1 beq _023071B8 cmp r1, #2 moveq r1, #3 - streq r1, [r2, #0x80] + streq r1, [r2, #0x80 + OV11_02306C9C_OFFSET] ldreq r0, [r0] - streq r1, [r0, #0x28] + streq r1, [r0, #0x28 + OV11_02306C9C_OFFSET] beq _023071B8 mov r1, #2 - str r1, [r2, #0x28] + str r1, [r2, #0x28 + OV11_02306C9C_OFFSET] ldr r0, [r0] sub r1, r1, #4 ldrsb r0, [r0, #0x21] @@ -51071,7 +51868,7 @@ _02307124: b _023071B8 _0230717C: mov r1, #3 - str r1, [r2, #0x28] + str r1, [r2, #0x28 + OV11_02306C9C_OFFSET] ldr r0, [r0] sub r1, r1, #5 ldrsb r0, [r0, #0x21] @@ -51084,7 +51881,7 @@ _0230717C: strb r1, [r0, #0x21] b _023071B8 _023071B0: - ldr r0, [r2, #0x80] + ldr r0, [r2, #0x80 + OV11_02306C9C_OFFSET] ldmia sp!, {r3, pc} _023071B8: mov r0, #1 @@ -51378,12 +52175,16 @@ _02307548: tst r0, #0xff beq _023075E4 ldrsh r0, [r6, #4] -#ifdef EUROPE +#if defined(EUROPE) add r0, r0, #0x4b + add r0, r0, #0x2f00 +#elif defined(JAPAN) + add r0, r0, #0x41 + add r0, r0, #0x1d00 #else add r0, r0, #0x49 -#endif add r0, r0, #0x2f00 +#endif mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl StringFromId @@ -51835,7 +52636,11 @@ _02307C48: ldr r5, _023082FC ; =0x000002BB b _02307C5C _02307C50: +#ifdef JAPAN + ldr r5, _02309898 ; =0x00002FDC +#else mov r5, #0x2bc +#endif b _02307C5C _02307C58: mov r5, #0 @@ -52012,10 +52817,17 @@ _02307EB8: ldr r0, _02308310 ; =0x000002C3 b _02307ECC _02307EC0: +#ifdef JAPAN + ldr r0, _023098B0 ; =0x00002FE4 + b _02307ECC +_02307EC8: + ldr r0, _023098B4 ; =0x00002FE0 +#else mov r0, #0x2c4 b _02307ECC _02307EC8: mov r0, #0x2c0 +#endif _02307ECC: cmp r0, #0 moveq r0, #0x10 @@ -52284,12 +53096,17 @@ _02308274: str r1, [r0] b _02308CF0 .align 2, 0 +#ifdef JAPAN +#define OV11_02307334_OFFSET 0x2D20 +#else +#define OV11_02307334_OFFSET 0 +#endif _023082B4: .word ov11_02324D8C _023082B8: .word ov11_02307300 _023082BC: .word ov11_02322C88 _023082C0: .word ov11_02322DB0 _023082C4: .word ov11_02322D38 -_023082C8: .word 0x000002B6 +_023082C8: .word 0x000002B6 + OV11_02307334_OFFSET _023082CC: .word ov11_02322CB8 _023082D0: .word 0x00400213 _023082D4: .word 0x00400013 @@ -52299,15 +53116,22 @@ _023082E0: .word ov11_02322D10 _023082E4: .word ov11_02322D60 _023082E8: .word ov11_02322C98 _023082EC: .word ov11_02322CD8 -_023082F0: .word 0x000002BE -_023082F4: .word 0x000002B9 -_023082F8: .word 0x000002BA -_023082FC: .word 0x000002BB -_02308300: .word 0x000002BD -_02308304: .word 0x000002BF -_02308308: .word 0x000002C1 -_0230830C: .word 0x000002C2 -_02308310: .word 0x000002C3 +_023082F0: .word 0x000002BE + OV11_02307334_OFFSET +_023082F4: .word 0x000002B9 + OV11_02307334_OFFSET +_023082F8: .word 0x000002BA + OV11_02307334_OFFSET +_023082FC: .word 0x000002BB + OV11_02307334_OFFSET +#ifdef JAPAN +_02309898: .word 0x00002FDC +#endif +_02308300: .word 0x000002BD + OV11_02307334_OFFSET +_02308304: .word 0x000002BF + OV11_02307334_OFFSET +_02308308: .word 0x000002C1 + OV11_02307334_OFFSET +_0230830C: .word 0x000002C2 + OV11_02307334_OFFSET +_02308310: .word 0x000002C3 + OV11_02307334_OFFSET +#ifdef JAPAN +_023098B0: .word 0x00002FE4 +_023098B4: .word 0x00002FE0 +#endif _02308314: .word ov11_02322CC8 _02308318: .word ov11_02322CF0 _0230831C: @@ -52622,7 +53446,11 @@ _02308748: _023087A0: bl ov11_02308EDC ldr r0, _023082B4 ; =ov11_02324D8C +#ifdef JAPAN + ldr r2, _0230A2B0_JP ; =0x0000248F +#else mov r1, #0x18 +#endif ldr r0, [r0] add r2, r1, #0xf10 ldrsb r0, [r0, #8] @@ -52861,12 +53689,16 @@ _02308AB4: str r4, [sp, #0x438] str r6, [sp] ldrsh r4, [r5, #0x4e] -#ifdef EUROPE +#if defined(EUROPE) add r4, r4, #0xd3 + add r4, r4, #0x2900 +#elif defined(JAPAN) + add r4, r4, #0xce + add r4, r4, #0x4100 #else add r4, r4, #0xd1 -#endif add r4, r4, #0x2900 +#endif mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, r6} @@ -52927,9 +53759,15 @@ _02308C00: bl ov11_02308EDC _02308C1C: ldr r0, _023082B4 ; =ov11_02324D8C +#ifdef JAPAN + ldr r2, _0230A2C4_JP ; =0x00002FD4 + ldr r0, [r0] + mov r1, #0x18 +#else mov r1, #0x18 ldr r0, [r0] mov r2, #0x2b4 +#endif ldrsb r0, [r0, #8] mov r3, #0 bl ShowStringIdInDialogueBox @@ -52989,14 +53827,27 @@ _02308CF4: add sp, sp, #0x5a0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 +#ifdef JAPAN +_02308CFC: .word 0x00001D2F +_02308D00: .word 0x0000131B +_02308D04: .word 0x0000248A +_02308D08: .word 0x0000248B +_0230A2B0_JP: .word 0x0000248F +#else _02308CFC: .word 0x000008D7 _02308D00: .word 0x0000131B _02308D04: .word 0x00000F23 _02308D08: .word 0x00000F24 -_02308D0C: .word 0x000002CB +#endif +_02308D0C: .word 0x000002CB + OV11_02307334_OFFSET _02308D10: .word ov11_02322C78 _02308D14: .word 0x00001013 +#ifdef JAPAN +_02308D18: .word 0x00001D3C +_0230A2C4_JP: .word 0x00002FD4 +#else _02308D18: .word 0x000008E4 +#endif arm_func_end ov11_02307334 arm_func_start ov11_02308D1C @@ -53262,7 +54113,11 @@ ov11_02309040: ; 0x02309040 cmp r0, #0 str r0, [r1] moveq r0, #0 +#ifdef JAPAN + strne r4, [r0, #0xf4] +#else strne r4, [r0, #0x114] +#endif ldrne r0, [r1] movne r1, #0 strne r1, [r0] @@ -53275,6 +54130,11 @@ _02309080: .word ov11_02324D90 arm_func_start ov11_02309084 ov11_02309084: ; 0x02309084 +#ifdef JAPAN +#define OV11_02309084_OFFSET -0x20 +#else +#define OV11_02309084_OFFSET 0 +#endif stmdb sp!, {r4, lr} mov r4, r0 ldr r0, _023090D4 ; =0x00000794 @@ -53286,14 +54146,18 @@ ov11_02309084: ; 0x02309084 moveq r0, #0 ldmeqia sp!, {r4, pc} mov r2, #2 - str r2, [r0, #0x114] + str r2, [r0, #0x114 + OV11_02309084_OFFSET] ldr r0, [r1] mov r2, #0 str r2, [r0] ldr r1, [r1] mov r0, #1 +#ifdef JAPAN + strh r4, [r1, #0xf8] +#else add r1, r1, #0x100 strh r4, [r1, #0x18] +#endif ldmia sp!, {r4, pc} .align 2, 0 _023090D4: .word 0x00000794 @@ -53340,15 +54204,20 @@ _023090FC: ; jump table b _02309D54 ; case 26 b _02309D6C ; case 27 _0230916C: - ldr r5, [r3, #0x114] + ldr r5, [r3, #0x114 + OV11_02309084_OFFSET] mov r0, #0 str r0, [sp, #4] ldr r8, [sp, #4] - add r4, r3, #0x11c + add r4, r3, #0x11c + OV11_02309084_OFFSET mov r2, r8 +#ifdef JAPAN + str r2, [sp, #8] + ldrsh r2, [r3, #0xf8] +#else add r3, r3, #0x100 str r2, [sp, #8] ldrsh r2, [r3, #0x18] +#endif mov r0, r4 mov r1, r5 str r2, [sp, #0x10] @@ -53560,37 +54429,37 @@ _02309450: str r0, [r4, #0x34] ldr r0, [r1] mov r2, #0x10 - str r2, [r0, #0x88] + str r2, [r0, #0x88 + OV11_02309084_OFFSET] ldr r0, [r1] - str r3, [r0, #0x7c] + str r3, [r0, #0x7c + OV11_02309084_OFFSET] ldr r3, [r1] - ldr r0, [r3, #0x114] + ldr r0, [r3, #0x114 + OV11_02309084_OFFSET] cmp r0, #1 ldreq r0, _02309D94 ; =0x000002F2 - streqh r0, [r3, #0x84] + streqh r0, [r3, #0x84 + OV11_02309084_OFFSET] beq _023094E0 cmp r0, #2 ldrne r0, _02309D98 ; =0x00000A3A - strneh r0, [r3, #0x84] + strneh r0, [r3, #0x84 + OV11_02309084_OFFSET] bne _023094E0 ldr r2, _02309D94 ; =0x000002F2 ldr r0, [sp, #0x14] - strh r2, [r3, #0x84] + strh r2, [r3, #0x84 + OV11_02309084_OFFSET] orr r0, r0, #0x200 ldr r2, [r1] str r0, [sp, #0x14] - add r0, r2, #0x18c - str r0, [r2, #0xdc] + add r0, r2, #0x18c + OV11_02309084_OFFSET + str r0, [r2, #0xdc + OV11_02309084_OFFSET] ldr r1, [r1] - ldr r0, [r1, #0x150] - str r0, [r1, #0x7c] + ldr r0, [r1, #0x150 + OV11_02309084_OFFSET] + str r0, [r1, #0x7c + OV11_02309084_OFFSET] _023094E0: ldr r1, _02309D80 ; =ov11_02324D90 ldr r0, _02309D9C ; =ov11_02322DD0 ldr r3, [r1] ldr r1, [sp, #0x14] - add r2, r3, #0x7c - add r3, r3, #0x154 + add r2, r3, #0x7c + OV11_02309084_OFFSET + add r3, r3, #0x154 + OV11_02309084_OFFSET bl CreateParentMenu ldr r1, _02309D80 ; =ov11_02324D90 mov r2, #1 @@ -53621,7 +54490,7 @@ _02309538: _0230955C: add r1, sp, #0x18 mov r0, #0 - ldr r5, [r3, #0x114] + ldr r5, [r3, #0x114 + OV11_02309084_OFFSET] bl GetPressedButtons ldrh r0, [sp, #0x18] tst r0, #8 @@ -53639,7 +54508,7 @@ _02309588: ldrsb r0, [r4, #4] bl sub_0202AB80 add r0, r4, r0, lsl #3 - ldr r1, [r0, #0x158] + ldr r1, [r0, #0x158 + OV11_02309084_OFFSET] ldr r0, _02309D80 ; =ov11_02324D90 str r1, [r4, #0x10] ldr r0, [r0] @@ -53671,7 +54540,7 @@ _023095E0: ldr r2, [r1] str r0, [r2, #0x10] ldr r1, [r1] - add r2, r1, #0x11c + add r2, r1, #0x11c + OV11_02309084_OFFSET ldr r1, [r2, r0, lsl #3] add r5, r2, r0, lsl #3 cmp r1, #1 @@ -53692,7 +54561,7 @@ _02309658: ldr r1, _02309D80 ; =ov11_02324D90 mov r5, r0 ldr r1, [r1] - ldr r0, [r1, #0x114] + ldr r0, [r1, #0x114 + OV11_02309084_OFFSET] sub r0, r0, #1 cmp r0, #1 movls r0, #0x1a @@ -53802,7 +54671,7 @@ _023097D8: b _02309D74 _023097EC: ldr r0, [r3, #0x10] - add r1, r3, #0x11c + add r1, r3, #0x11c + OV11_02309084_OFFSET add r4, r1, r0, lsl #3 ldrsh r0, [r4, #4] bl GetActiveTeamMember @@ -53852,9 +54721,14 @@ _0230987C: b _02309D74 _023098A8: ldr r0, [r3, #0x10] +#ifdef JAPAN + mov r0, r0, lsl #0x10 + mov r0, r0, asr #0x10 +#else add r0, r3, r0, lsl #3 add r0, r0, #0x100 ldrsh r0, [r0, #0x20] +#endif bl sub_0203FBD4 mov r1, #0 mov r2, r1 @@ -53875,7 +54749,7 @@ _023098E4: ldr r0, [r1, #0x10] add r0, r1, r0, lsl #3 add r0, r0, #0x100 - ldrsh r0, [r0, #0x20] + ldrsh r0, [r0, #0x20 + OV11_02309084_OFFSET] bl sub_0203FDEC bl sub_020407C0 ldr r0, _02309D80 ; =ov11_02324D90 @@ -53894,7 +54768,7 @@ _02309934: ldr r0, _02309D80 ; =ov11_02324D90 ldr r1, [r0] ldr r0, [r1, #0x10] - add r1, r1, #0x11c + add r1, r1, #0x11c + OV11_02309084_OFFSET add r4, r1, r0, lsl #3 bl sub_0203FD38 ldr r2, _02309D80 ; =ov11_02324D90 @@ -53957,7 +54831,7 @@ _02309A2C: ldr r0, [r3, #0x10] add r0, r3, r0, lsl #3 add r0, r0, #0x100 - ldrsh r0, [r0, #0x20] + ldrsh r0, [r0, #0x20 + OV11_02309084_OFFSET] bl GetActiveTeamMember mov r1, r0 ldrsh r0, [r1, #0xc] @@ -54000,7 +54874,7 @@ _02309AB4: b _02309D74 _02309AD0: ldr r0, [r3, #0x10] - add r1, r3, #0x11c + add r1, r3, #0x11c + OV11_02309084_OFFSET add r0, r1, r0, lsl #3 bl ov11_0230A044 ldr r2, _02309D80 ; =ov11_02324D90 @@ -54011,7 +54885,11 @@ _02309AD0: bl StrncpySimpleNoPad ldr r0, _02309D80 ; =ov11_02324D90 ldr r1, [r0] +#ifdef JAPAN + add r0, r1, #0x48 +#else add r0, r1, #0x52 +#endif add r1, r1, #0x3e bl StrcpySimple ldr r1, _02309D80 ; =ov11_02324D90 @@ -54019,7 +54897,11 @@ _02309AD0: ldr r3, [r1] mov r2, #0 add r1, r3, #0x3e +#ifdef JAPAN + add r3, r3, #0x48 +#else add r3, r3, #0x52 +#endif bl ShowKeyboard bl ov11_02310BDC ldr r0, _02309D80 ; =ov11_02324D90 @@ -54067,12 +54949,20 @@ _02309BA4: bgt _02309D74 ldr r1, [r0] mov r2, #0xa +#ifdef JAPAN + add r0, r1, #0x52 +#else add r0, r1, #0x66 +#endif add r1, r1, #0x3e bl StrncpySimpleNoPadSafe ldr r0, _02309D80 ; =ov11_02324D90 ldr r0, [r0] +#ifdef JAPAN + add r0, r0, #0x52 +#else add r0, r0, #0x66 +#endif bl sub_0203909C ldr r0, _02309D80 ; =ov11_02324D90 mov r1, #0x14 @@ -54081,7 +54971,7 @@ _02309BA4: b _02309D74 _02309C04: ldr r0, [r3, #0x10] - add r1, r3, #0x11c + add r1, r3, #0x11c + OV11_02309084_OFFSET add r4, r1, r0, lsl #3 mov r0, r4 bl ov11_0230A044 @@ -54131,7 +55021,11 @@ _02309CA4: ldr r3, [r1] mov r2, #0 add r1, r3, #0x3e +#ifdef JAPAN + add r3, r3, #0x48 +#else add r3, r3, #0x52 +#endif bl ShowKeyboard ldr r0, _02309D80 ; =ov11_02324D90 mov r1, #0x12 @@ -54192,8 +55086,13 @@ _02309D84: .word 0x00401833 _02309D88: .word ov11_02322E58 _02309D8C: .word ov11_02322E7C _02309D90: .word ov11_02322EA0 +#ifdef JAPAN +_02309D94: .word 0x00002FF2 +_02309D98: .word 0x00000875 +#else _02309D94: .word 0x000002F2 _02309D98: .word 0x00000A3A +#endif _02309D9C: .word ov11_02322DD0 _02309DA0: .word ov11_02322DE0 _02309DA4: .word ov11_02322E28 @@ -54205,7 +55104,11 @@ ov11_02309DAC: ; 0x02309DAC ldr r1, _02309DF4 ; =ov11_02324D90 ldr r1, [r1] ldr r2, [r1, #0x10] +#ifdef JAPAN + add r3, r1, #0xfc +#else add r3, r1, #0x11c +#endif ldr r1, [r3, r2, lsl #3] add r2, r3, r2, lsl #3 cmp r1, #1 @@ -54586,8 +55489,10 @@ _0230A2A8: ldmia sp!, {r4, pc} .align 2, 0 _0230A2B0: .word ov11_02324D94 -#ifdef EUROPE +#if defined(EUROPE) _0230A2B4: .word 0x00003FBA +#elif defined(JAPAN) +_0230A2B4: .word 0x000049BB #else _0230A2B4: .word 0x00003FB8 #endif @@ -54610,12 +55515,16 @@ ov11_0230A2D0: ; 0x0230A2D0 ldrh r1, [r0, r1] mov r0, r5 bl sub_02030A2C -#ifdef EUROPE +#if defined(EUROPE) add r0, r4, #0xc3 + add r0, r0, #0x3f00 +#elif defined(JAPAN) + add r0, r4, #0x1c4 + add r0, r0, #0x4800 #else add r0, r4, #0xc1 -#endif add r0, r0, #0x3f00 +#endif mov r1, r0, lsl #0x10 mov r0, r5 mov r3, r1, lsr #0x10 @@ -54751,11 +55660,19 @@ _0230A4B8: moveq r0, #0 cmp r0, #6 bne _0230AD00 +#ifdef JAPAN + ldr r0, [sb, #8] + ldr r3, _0230C2B4 ; =0x000003E7 + ldrsh r1, [r0, #4] + ldrb r2, [r0, #1] + add r0, sb, #0x54 +#else ldr r3, [sb, #8] add r0, sb, #0x54 ldrsh r1, [r3, #4] ldrb r2, [r3, #1] ldrsh r3, [r3, #8] +#endif bl sub_02053A0C strh r0, [sb, #0x50] mov r0, #0 @@ -54854,6 +55771,15 @@ _0230A644: ldrsh r2, [r4, #4] ldr r0, _0230AD1C ; =0xFFFFFE5E ldr r1, _0230AD20 ; =0x000004A9 +#ifdef JAPAN + add r0, r2, r0 + mov r0, r0, lsl #0x10 + mov r0, r0, asr #0x10 + mov r0, r0, lsl #0x10 + mov r0, r0, lsr #0x10 + cmp r0, #3 + addls r1, r1, #1 +#else add r2, r2, r0 mov r2, r2, lsl #0x10 mov r2, r2, asr #0x10 @@ -54861,6 +55787,7 @@ _0230A644: mov r2, r2, lsr #0x10 cmp r2, #3 rsbls r1, r0, #0x308 +#endif add r2, sp, #0x114 mov r0, #0x1c bl sub_02046BE8 @@ -55323,23 +56250,31 @@ _0230AD04: add sp, sp, #0x1b4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 +#ifdef JAPAN +#define OV11_0230A390_OFFSET 0x3725 +#else +#define OV11_0230A390_OFFSET 0 +#endif _0230AD0C: .word ov11_02324D98 -_0230AD10: .word 0x000004A6 +_0230AD10: .word 0x000004A6 + OV11_0230A390_OFFSET +#ifdef JAPAN +_0230C2B4: .word 0x000003E7 +#endif _0230AD14: .word 0x0000131B -_0230AD18: .word 0x000004A8 +_0230AD18: .word 0x000004A8 + OV11_0230A390_OFFSET _0230AD1C: .word 0xFFFFFE5E -_0230AD20: .word 0x000004A9 +_0230AD20: .word 0x000004A9 + OV11_0230A390_OFFSET _0230AD24: .word ov11_02322F5C _0230AD28: .word ov11_02322F58 _0230AD2C: .word ov11_02322F30 _0230AD30: .word 0x00000233 -_0230AD34: .word 0x000004AC -_0230AD38: .word 0x000004AB +_0230AD34: .word 0x000004AC + OV11_0230A390_OFFSET +_0230AD38: .word 0x000004AB + OV11_0230A390_OFFSET _0230AD3C: .word ov11_02322F40 _0230AD40: .word ov11_02322F80 _0230AD44: .word ov11_02322F84 _0230AD48: .word ov11_02322F24 -_0230AD4C: .word 0x000004A7 +_0230AD4C: .word 0x000004A7 + OV11_0230A390_OFFSET arm_func_end ov11_0230A390 arm_func_start ov11_0230AD50 @@ -55689,18 +56624,23 @@ _0230B184: add sp, sp, #0x15c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 +#ifdef JAPAN +#define GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET 0x3528 +#else +#define GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET 0 +#endif _0230B1DC: .word ov11_02324DA0 _0230B1E0: .word ov11_02322FA8 _0230B1E4: .word ov11_02322FB0 _0230B1E8: .word ov11_02322FC0 -_0230B1EC: .word 0x000004B2 -_0230B1F0: .word 0x000004B3 +_0230B1EC: .word 0x000004B2 + GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET +_0230B1F0: .word 0x000004B3 + GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET _0230B1F4: .word 0x000002FE _0230B1F8: .word 0x00000336 -_0230B1FC: .word 0x000004B5 -_0230B200: .word 0x000004B4 -_0230B204: .word 0x000004B6 -_0230B208: .word 0x000004B7 +_0230B1FC: .word 0x000004B5 + GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET +_0230B200: .word 0x000004B4 + GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET +_0230B204: .word 0x000004B6 + GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET +_0230B208: .word 0x000004B7 + GET_EXCLUSIVE_ITEM_REQUIREMENTS_OFFSET arm_func_end GetExclusiveItemRequirements arm_func_start ov11_0230B20C @@ -55848,7 +56788,11 @@ _0230B3D4: add r0, r2, #0x4000 str r3, [r0, #0x63c] ldr r0, [r1, #4] +#ifdef JAPAN + ldr r1, _0230CC20_JP ; =0x000032B2 +#else mov r1, #0x3a8 +#endif add r0, r0, #0x4600 strh r1, [r0, #0x34] b _0230B474 @@ -56008,9 +56952,16 @@ _0230B664: .word ov11_02324DA4 _0230B668: .word 0x00401A33 _0230B66C: .word ov11_0230BD5C _0230B670: .word 0x000046D4 +#ifdef JAPAN +_0230B674: .word 0x000032B0 +_0230B678: .word 0x000032B1 +_0230CC20_JP: .word 0x000032B2 +_0230B67C: .word 0x000031F4 +#else _0230B674: .word 0x000003A6 _0230B678: .word 0x000003A7 _0230B67C: .word 0x0000032F +#endif _0230B680: .word 0x80040004 _0230B684: .word ov11_0230B78C _0230B688: .word ov11_0230BE34 @@ -56702,10 +57653,14 @@ _0230BF7C: ldmia sp!, {r3, pc} .align 2, 0 _0230BF8C: .word ov11_02324DA4 +#if defined(EUROPE) _0230BF90: .word 0x0000032F -#ifdef EUROPE _0230BF94: .word 0x00004642 +#elif defined(JAPAN) +_0230BF90: .word 0x000031F4 +_0230BF94: .word 0x00001CDF #else +_0230BF90: .word 0x0000032F _0230BF94: .word 0x00004623 #endif arm_func_end ov11_0230BF38 @@ -57552,7 +58507,11 @@ ov11_0230CA7C: ; 0x0230CA7C bl UpdateWindow ldmia sp!, {r4, pc} .align 2, 0 +#ifdef JAPAN +_0230CAA0: .word 0x000032B3 +#else _0230CAA0: .word 0x000003A9 +#endif arm_func_end ov11_0230CA7C arm_func_start ov11_0230CAA4 @@ -57609,6 +58568,17 @@ ov11_0230CB28: ; 0x0230CB28 ldr r1, _0230CB84 ; =ov11_02324DA4 str r0, [sp, #0x28] ldr r0, [r1, #4] +#ifdef JAPAN + add r2, sp, #4 + add r0, r0, #0x4600 + ldrh r1, [r0, #0x28] + ldr r3, _0230E130 ; =0x000032B4 + mov r0, r4 + str r1, [sp, #0x2c] + str r2, [sp] + mov r1, #6 + mov r2, #2 +#else mov r2, #2 add r0, r0, #0x4600 ldrh r3, [r0, #0x28] @@ -57618,6 +58588,7 @@ ov11_0230CB28: ; 0x0230CB28 str r1, [sp] add r3, r2, #0x3a8 mov r1, #6 +#endif bl sub_020262E0 mov r0, r4 bl UpdateWindow @@ -57625,6 +58596,9 @@ ov11_0230CB28: ; 0x0230CB28 ldmia sp!, {r3, r4, pc} .align 2, 0 _0230CB84: .word ov11_02324DA4 +#ifdef JAPAN +_0230E130: .word 0x000032B4 +#endif arm_func_end ov11_0230CB28 arm_func_start ov11_0230CB88 @@ -60029,8 +61003,10 @@ _0230E854: ldmia sp!, {r3, pc} .align 2, 0 _0230E8C0: .word ov11_02324DDC -#ifdef EUROPE +#if defined(EUROPE) _0230E8C4: .word 0x00003FCC +#elif defined(JAPAN) +_0230E8C4: .word 0x000049CD #else _0230E8C4: .word 0x00003FCA #endif @@ -64400,11 +65376,15 @@ _02312260: .word ov11_02323BF8 arm_func_start ov11_02312264 ov11_02312264: ; 0x02312264 stmdb sp!, {r3, lr} +#ifdef JAPAN + mov r0, #0xf4 +#else mov r0, #0x1b8 +#endif mov r1, #0xf bl MemAlloc ldr r1, _0231233C ; =ov11_02324E18 -#ifdef EUROPE +#if defined(EUROPE) mvn r2, #0 str r0, [r1, #4] strh r2, [r0] @@ -64416,19 +65396,38 @@ ov11_02312264: ; 0x02312264 ldrsh r2, [r0, r2] ldr r0, [r1, #4] rsb r3, ip, #0x114 + strh r2, [r0, #0x2c] + ldr r2, [r1, #4] + mov r0, #0 + strh ip, [r2, #0x2c] + ldr r2, [r1, #4] +#elif defined(JAPAN) + mvn r2, #0 + str r0, [r1, #4] + strh r2, [r0] + mov r0, #0 + mov r1, #0x46 + bl LoadScriptVariableValue + cmp r0, #1 + ldreq r0, _0231233C ; =ov11_02324E18 + ldreq r1, _023138CC ; =0x00000116 + ldrne r0, _0231233C ; =ov11_02324E18 + ldrne r1, _023138D0_JP ; =0x00000115 + ldr r0, [r0, #4] + mvn r3, #0 + strh r1, [r0, #0x2c] + ldr r1, _0231233C ; =ov11_02324E18 + mov r0, #0 + ldr r2, [r1, #4] #else mvn r3, #0 str r0, [r1, #4] strh r3, [r0] ldr r0, [r1, #4] rsb r2, r3, #0x114 -#endif strh r2, [r0, #0x2c] ldr r2, [r1, #4] mov r0, #0 -#ifdef EUROPE - strh ip, [r2, #0x2c] - ldr r2, [r1, #4] #endif strh r3, [r2, #2] ldr r1, [r1, #4] @@ -64462,6 +65461,7 @@ ov11_02312264: ; 0x02312264 mov r2, #0 add r0, r0, #0x30 bl SetAnimDataFields2 +#ifndef JAPAN #ifdef EUROPE bl GetLanguage mov r2, r0, lsl #1 @@ -64485,18 +65485,23 @@ ov11_02312264: ; 0x02312264 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xf4 +#endif bl SetAnimDataFields2 bl ov11_02312398 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 _0231233C: .word ov11_02324E18 -#ifdef EUROPE +#if defined(EUROPE) _02312D14: .word 0x0232473C _02312D18: .word 0x00000115 _02312D1C: .word 0x02324728 _02312340: .word 0xA0080000 _02312344: .word 0x02324732 +#elif defined(JAPAN) +_023138CC: .word 0x00000116 +_023138D0_JP: .word 0x00000115 +_02312340: .word 0xA0080000 #else _02312340: .word 0xA0080000 _02312344: .word 0x00000179 @@ -64513,10 +65518,12 @@ ov11_02312348: ; 0x02312348 add r0, r0, #0x30 bl ov11_022F6EFC ldr r0, _02312394 ; =ov11_02324E18 +#ifndef JAPAN ldr r0, [r0, #4] add r0, r0, #0xf4 bl ov11_022F6EFC ldr r0, _02312394 ; =ov11_02324E18 +#endif ldr r0, [r0, #4] bl MemFree ldr r0, _02312394 ; =ov11_02324E18 @@ -64729,8 +65736,13 @@ _02312624: _0231263C: ldr r0, _02312724 ; =ov11_02323BD0 ldrsh r3, [r4] +#ifdef JAPAN + ldr ip, [r0, #4] + ldr lr, [r0] +#else ldr ip, [r0, #0x24] ldr lr, [r0, #0x20] +#endif ldr r1, _02312728 ; =ov11_02323CAC add r0, sp, #0 mov r2, r5 @@ -64819,12 +65831,14 @@ ov11_02312730: ; 0x02312730 add r0, r0, #0x30 bl AnimRelatedFunction__022F6F14 ldr r0, _023127F8 ; =ov11_02324E18 +#ifndef JAPAN ldr r1, _02312800 ; =ov11_02323BD8 ldr r0, [r0, #4] mov r2, #0 add r0, r0, #0xf4 bl AnimRelatedFunction__022F6F14 ldr r0, _023127F8 ; =ov11_02324E18 +#endif add r1, sp, #0 ldr r0, [r0, #4] mov r2, #0 @@ -64853,7 +65867,9 @@ _023127E8: .align 2, 0 _023127F8: .word ov11_02324E18 _023127FC: .word ov11_02323BE8 +#ifndef JAPAN _02312800: .word ov11_02323BD8 +#endif arm_func_end ov11_02312730 arm_func_start ov11_02312804 @@ -69670,12 +70686,16 @@ _02316A18: .align 2, 0 _02316A2C: .word ov11_02324C38 _02316A30: .word ov11_02324C30 -#ifdef EUROPE +#if defined(EUROPE) _02316A34: .word 0x00003C2C +_02316A38: .word 0x000008DF +#elif defined(JAPAN) +_02316A34: .word 0x00003868 +_02316A38: .word 0x00001D37 #else _02316A34: .word 0x00003C2A -#endif _02316A38: .word 0x000008DF +#endif arm_func_end ov11_023168E0 .global ov11_02316A3C