From 77e17e890a5ef7c8eb2b077e350ebfaf062a0ba7 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 3 Oct 2023 15:55:07 +0200 Subject: [PATCH] Revert JPN diffs --- asm/main.s | 798 ++--------------------------------------------------- 1 file changed, 22 insertions(+), 776 deletions(-) diff --git a/asm/main.s b/asm/main.s index 127fa803..04e2bf1d 100644 --- a/asm/main.s +++ b/asm/main.s @@ -56093,7 +56093,6 @@ _0202aae0: .global func_0202aae8 thumb_func_start func_0202aae8 func_0202aae8: ; 0x0202aae8 -.ifdef EUR push {r4, lr} add r4, r0, #0 bl func_0202aaf8 @@ -56101,17 +56100,11 @@ func_0202aae8: ; 0x0202aae8 add r0, r4, #0 pop {r4, pc} .align 2, 0 -.endif -.ifdef JPN - bx lr - .align 2, 0 -.endif thumb_func_end func_0202aae8 .global func_0202aaf8 thumb_func_start func_0202aaf8 func_0202aaf8: ; 0x0202aaf8 -.ifdef EUR push {r3, r4, lr} sub sp, #0x54 add r0, sp, #0 @@ -56149,11 +56142,6 @@ _0202ab32: add r0, r4, #0 add sp, #0x54 pop {r3, r4, pc} -.endif -.ifdef JPN - mov r0, #0, - bx lr -.endif thumb_func_end func_0202aaf8 .global func_0202ab38 @@ -56171,12 +56159,7 @@ _0202ab44: .word data_0205618c .global func_0202ab48 thumb_func_start func_0202ab48 func_0202ab48: ; 0x0202ab48 -.ifdef EUR mov r0, #2 -.endif -.ifdef JPN - mov r0, #0 -.endif bx lr thumb_func_end func_0202ab48 @@ -58022,26 +58005,14 @@ _0202c124: .word 0x05000400 func_0202c128: ; 0x0202c128 push {r4, r5, r6, lr} sub sp, #8 -.ifdef EUR add r5, r0, #0 add r4, r1, #0 -.endif -.ifdef JPN - add r4, r0, #0 - add r5, r1, #0 -.endif blx func_01ffa8d4 -.ifdef EUR cmp r5, #0 -.endif -.ifdef JPN - cmp r4, #0 -.endif beq _0202c16a bl func_0201b248 ldr r1, _0202c360 ; =0x04000060 ldr r2, _0202c364 ; =0xffffcfff -.ifdef EUR ldrh r0, [r1] add r3, r0, #0 and r3, r2 @@ -58062,32 +58033,6 @@ func_0202c128: ; 0x0202c128 str r1, [r0] ldr r0, _0202c374 ; =data_027e03fc str r1, [r0, #0x20] -.endif -.ifdef JPN - ldrh r1, [r2] - and r1, r0 - mov r0, #8 - orr r0, r1 - strh r0, [r2] - blx func_0200ee4c - add r4, r0, #0 - ldr r0, _0202c368 ; =0x04000540 - mov r1, #3 - str r1, [r0] - mov r3, #0 - ldr r2, _0202c36c_jpn ; =0x00007fff - add r0, r5, #0 - mov r1, #0x1f - str r3, [sp] - blx func_02005a30 - ldr r1, _0202c36c ; =0xbfff0000 - ldr r0, _0202c370 ; =0x04000580 - str r1, [r0] - ldr r0, _0202c374 ; =unk_027e03fc - str r1, [r0, #0x20] - add r0, r4, #0 - blx func_0200ee60 -.endif _0202c16a: mov r1, #0 mov r0, #1 @@ -58315,19 +58260,11 @@ _0202c16a: blx func_020039b0 add sp, #8 pop {r4, r5, r6, pc} -.ifdef EUR nop -.endif -.ifdef JPN - .align 2, 0 -.endif thumb_func_end func_0202c128 _0202c360: .word 0x04000060 _0202c364: .word 0xffffcfff _0202c368: .word 0x04000540 -.ifdef JPN -_0202c36c_jpn: .word 0x00007fff -.endif _0202c36c: .word 0xbfff0000 _0202c370: .word 0x04000580 _0202c374: .word data_027e03fc @@ -59162,9 +59099,7 @@ _0202cbec: ldr r0, _0202cea8 ; =data_027e037c mov r1, #0 str r1, [r0, #0xfc] -.ifdef EUR bl func_01ffa8d4 -.endif EUR ldr r1, _0202ceb0 ; =0xbfff0000 ldr r0, _0202ce50 ; =0x04000580 str r1, [r0] @@ -59305,9 +59240,7 @@ _0202ce14: cmp r0, #0 bne _0202ce14 _0202ce2c: -.ifdef EUR bl func_01ffa8d4 -.endif EUR mov r0, sl blx func_0202c6c8 bl func_01ffa8d4 @@ -59447,14 +59380,12 @@ _0202cf68: _0202cf94: ldr r0, _0202d080 ; =data_027e080c bl func_0202eef8 -.ifdef EUR cmp r0, #0 beq _0202cfb4 ldr r0, _0202d084 ; =data_027e08f8 mov r1, #1 strb r1, [r0, #1] b _0202d068 -.endif _0202cfb4: ldr r0, _0202d088 ; =data_027e0c54 add r1, r4, #0xf0 @@ -59515,9 +59446,7 @@ _0202d070: arm_func_end func_0202cf44 _0202d07c: .word 0x04000606 _0202d080: .word data_027e080c -.ifdef EUR _0202d084: .word data_027e08f8 -.endif _0202d088: .word data_027e0c54 _0202d08c: .word data_027e0c38 _0202d090: .word data_027e0c68 @@ -59650,16 +59579,6 @@ func_0202d164: ; 0x0202d164 str r0, [sp] mov r3, #0 mov r0, #0x1f -.ifdef JPN - mov r1, #0x15 - mov r2, #2 - str r3, [sp, #4] - bl func_020304d4 - ldr r0, _0202d1c0_jpn ; =data_020580a0_jpn - mov r3, #0 - str r0, [sp] - mov r0, #0x1f -.endif mov r1, #0x16 mov r2, #2 str r3, [sp, #4] @@ -59670,9 +59589,6 @@ func_0202d164: ; 0x0202d164 mov r1, #0x17 str r0, [sp] mov r0, #0x1f -.ifdef JPN - mov r1, #0x17 -.endif mov r2, #2 str r3, [sp, #4] bl func_020304d4 @@ -59683,13 +59599,7 @@ func_0202d164: ; 0x0202d164 _0202d1b4: .word data_0205765c _0202d1b8: .word data_020561f0 _0202d1bc: .word data_027e05f4 -.ifdef EUR _0202d1c0: .word data_02056c30 -.endif -.ifdef JPN -_0202d1c0_jpn: .word data_02057664_jpn -_0202d1c4_jpn: .word data_02057670_jpn -.endif .global func_0202d1c4 thumb_func_start func_0202d1c4 @@ -62506,9 +62416,7 @@ func_0202eef8: ; 0x0202eef8 ldreq r0, [r6, #8] cmpeq r0, #0 addeq sp, sp, #0x28 -.ifdef EUR moveq r0, #0 -.endif ldmeqia sp!, {r4, r5, r6, pc} mov r5, #0 bl func_0200ee4c @@ -62649,15 +62557,7 @@ _0202f0f8: _0202f10c: mov r0, r4 bl func_0200ee60 -.ifdef EUR mov r0, r5 -.endif -.ifdef JPN - cmp r5, #0 - addeq sp, sp, #0x28 - ldmeqia sp!, {r4, r5, r6, pc} - blx func_0202f8e8 -.endif add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 @@ -63626,9 +63526,27 @@ _0202f8dc: .word data_027e0618 _0202f8e0: .word data_027e0900 _0202f8e4: .word data_ov00_020ee734 -.ifdef EUR -.include "main/func_0202f8e8.s" ; This function was moved up in EUR/USA -.endif + .global func_0202f8e8 + thumb_func_start func_0202f8e8 +func_0202f8e8: ; 0x0202f8e8 + push {r3, lr} + ldr r0, _0202f90c ; =data_027e0618 + bl func_0202cf34 + bl func_0202bac4 + blx func_02003a18 + ldr r2, _0202f910 ; =0x04001000 + ldr r0, _0202f914 ; =0xfffeffff + ldr r1, [r2] + and r0, r1 + str r0, [r2] + mov r0, #1 + blx func_0200ef98 + pop {r3, pc} + nop + thumb_func_end func_0202f8e8 +_0202f90c: .word data_027e0618 +_0202f910: .word 0x04001000 +_0202f914: .word 0xfffeffff .global func_0202f918 thumb_func_start func_0202f918 @@ -63704,13 +63622,11 @@ _0202f99c: .word data_ov00_020ee734 func_0202f9a0: ; 0x0202f9a0 stmdb sp!, {r4, lr} mov r4, r0 -.ifdef EUR ldrb r0, [r4, #1] cmp r0, #0 beq _0202f9bc blx func_0202f8e8 ldmia sp!, {r4, pc} -.endif _0202f9bc: ldrb r0, [r4] cmp r0, #0 @@ -63743,10 +63659,6 @@ _0202f9fc: _0202fa20: .word data_027e05f8 _0202fa24: .word data_027e071c -.ifdef JPN -.include "main/func_0202f8e8.s" ; This function was moved up in EUR/USA -.endif - .global func_0202fa28 thumb_func_start func_0202fa28 func_0202fa28: ; 0x0202fa28 @@ -64137,9 +64049,7 @@ func_0202fddc: ; 0x0202fddc sub sp, #0x80 add r5, r0, #0 add r0, sp, #0x2c -.ifdef EUR mov r1, #0xff -.endif bl func_02032d40 ldr r0, _0202ff18 ; =data_02056300 mov r1, #6 @@ -64180,15 +64090,8 @@ func_0202fddc: ; 0x0202fddc beq _0202fe46 b _0202fe48 _0202fe42: -.ifdef EUR ldr r4, _0202ff20 ; =0x00010001 b _0202fe48 -.endif -.ifdef JPN - mov r4, #1 - lsl r4, r4, #0x10 - b _0202fe48 -.endif _0202fe46: ldr r4, _0202ff24 ; =0x00010002 _0202fe48: @@ -64225,7 +64128,6 @@ _0202fe48: add r1, sp, #0x18 sub r2, #0x1d blx func_020338a8 -.ifdef EUR bl func_0202ab48 cmp r0, #0 beq _0202fec0 @@ -64248,7 +64150,6 @@ _0202fe48: mov r0, #0xc ldrsh r0, [r1, r0] strh r0, [r1, #8] -.endif _0202fec0: add r1, sp, #0x1c mov r2, #0 @@ -64300,9 +64201,7 @@ _0202ff0e: _0202ff18: .word data_02056300 _0202ff1c: .word data_02068e6c _0202ff20: .word 0x00010001 -.ifdef EUR _0202ff24: .word 0x00010002 -.endif _0202ff28: .word data_027e0c68 .global func_0202ff2c @@ -68302,19 +68201,9 @@ func_02032648: ; 0x02032648 mov r1, #1 strb r3, [r0, #0x12b] strb r1, [r0, #0x12c] -.ifdef EUR strh r3, [r0, #0x4a] -.endif -.ifdef JPN - strh r3, [r0, #0x3e] -.endif sub r2, r1, #2 -.ifdef EUR strb r3, [r0, #0x4c] -.endif -.ifdef JPN - strh r3, [r0, #0x40] -.endif add r1, r0, #0x100 strh r2, [r1, #0x28] strb r2, [r0, #0x12a] @@ -68350,39 +68239,19 @@ func_02032684: ; 0x02032684 b _020326f8 _020326d4: mov r0, #0 -.ifdef EUR strb r0, [r4, #0x4d] -.endif -.ifdef JPN - strb r0, [r4, #0x4e] -.endif b _020326f8 _020326e0: blx func_0202ab48 cmp r0, #0 moveq r0, #2 -.ifdef EUR streqb r0, [r4, #0x4d] -.endif -.ifdef JPN - streqb r0, [r4, #0x4e] -.endif movne r0, #1 -.ifdef EUR strneb r0, [r4, #0x4d] -.endif -.ifdef JPN - strneb r0, [r4, #0x4e] -.endif _020326f8: mov r0, #0 -.ifdef EUR strb r0, [r4, #0x4e] -.endif strb r0, [r4, #0x4f] -.ifdef JPN - strb r0, [r4, #0x50] -.endif str r0, [r4, #0x10] mov r0, #1 ldmia sp!, {r4, pc} @@ -68441,20 +68310,10 @@ func_02032788: ; 0x02032788 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, [r7, #0x124] -.ifdef EUR ldrh r2, [r7, #0x4a] -.endif -.ifdef JPN - ldrh r2, [r7, #0x3e] -.endif ldrsh r3, [r0] ldrsh r1, [r0, #2] -.ifdef EUR ldrb r0, [r7, #0x4c] -.endif -.ifdef JPN - ldrh r0, [r7, #0x40] -.endif mov r3, r3, lsl #0x14 mov r2, r2, lsr #0x1 rsb ip, r2, r3, asr #20 @@ -68564,12 +68423,7 @@ _020328e8: mov r0, r6 bl func_020337d8 _02032908: -.ifdef EUR ldrb r1, [r6, #0x4c] -.endif -.ifdef JPN - ldrh r1, [r6, #0x40] -.endif cmp r4, #0 sub r0, r1, r0 add r0, r0, r0, lsr #31 @@ -68957,29 +68811,16 @@ func_02032cfc: ; 0x02032cfc .global func_02032d18 thumb_func_start func_02032d18 func_02032d18: ; 0x02032d18 -.ifdef EUR push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 -.endif -.ifdef JPN - push {r4, lr} - add r4, r0, #0 -.endif bl func_02032f0c ldr r0, _02032d3c ; =data_02057958 mov r1, #0 -.ifdef EUR str r0, [r5] add r0, r5, #0 -.endif -.ifdef JPN - str r0, [r4] - add r0, r4, #0 -.endif add r0, #0x52 strh r1, [r0] -.ifdef EUR cmp r4, #0xff beq _02032d38 add r0, r5, #0 @@ -68988,11 +68829,6 @@ func_02032d18: ; 0x02032d18 _02032d38: add r0, r5, #0 pop {r3, r4, r5, pc} -.endif -.ifdef JPN - add r0, r4, #0 - pop {r4, pc} -.endif .align 2, 0 thumb_func_end func_02032d18 _02032d3c: .word data_02057958 @@ -69000,26 +68836,14 @@ _02032d3c: .word data_02057958 .global func_02032d40 thumb_func_start func_02032d40 func_02032d40: ; 0x02032d40 -.ifdef EUR push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 -.endif -.ifdef JPN - push {r4, lr} - add r4, r0, #0 -.endif bl func_02032f0c ldr r0, _02032d64 ; =data_02057958 mov r1, #0 -.ifdef EUR str r0, [r5] add r0, r5, #0 -.endif -.ifdef JPN - str r0, [r4] - add r0, r4, #0 -.endif add r0, #0x52 strh r1, [r0] cmp r4, #0xff @@ -69048,12 +68872,7 @@ func_02032d68: ; 0x02032d68 ldrb r1, [sp, #0x2c] ldrh r2, [sp, #0x30] ldr r0, [sp, #0x24] -.ifdef EUR strb r1, [r4, #0x50] -.endif -.ifdef JPN - strb r1, [r4, #0x51] -.endif strh r2, [r4, #0x52] bl func_0203d848 mov ip, r0 @@ -69111,7 +68930,6 @@ func_02032e44: ; 0x02032e44 ldmia sp!, {r4, pc} arm_func_end func_02032e44 -.ifdef EUR .global func_02032e60 arm_func_start func_02032e60 func_02032e60: ; 0x02032e60 @@ -69124,7 +68942,6 @@ func_02032e60: ; 0x02032e60 .align 2, 0 arm_func_end func_02032e60 _02032e78: .word data_027e05f4 -.endif .global func_02032e7c arm_func_start func_02032e7c @@ -69142,12 +68959,7 @@ func_02032e7c: ; 0x02032e7c blx func_0202ab48 cmp r0, #0 moveq r0, #2 -.ifdef EUR movne r0, #3 -.endif -.ifdef JPN - movne r0, #1 -.endif str r0, [r4, #0x10] mov r0, r4 ldmia sp!, {r4, pc} @@ -69171,12 +68983,7 @@ func_02032ec4: ; 0x02032ec4 blx func_0202ab48 cmp r0, #0 moveq r0, #2 -.ifdef EUR movne r0, #3 -.endif -.ifdef JPN - movne r0, #1 -.endif str r0, [r4, #0x10] mov r0, r4 ldmia sp!, {r4, pc} @@ -69198,23 +69005,15 @@ func_02032f0c: ; 0x02032f0c str r0, [r4, #0xc] str r0, [r4, #0x38] strh r0, [r4, #0x3c] -.ifdef EUR add r1, #0x4a -.endif -.ifdef JPN - strh r0, [r4, #0x3e] - add r1, #0x40 -.endif strh r0, [r1] add r1, r4, #0 -.ifdef EUR add r1, #0x4c strb r0, [r1] add r1, r4, #0 add r1, #0x4d strb r0, [r1] add r1, r4, #0 -.endif add r1, #0x4e strb r0, [r1] add r1, r4, #0 @@ -69237,12 +69036,7 @@ func_02032f0c: ; 0x02032f0c blx func_020078f4 add r1, r4, #0 mov r0, #0 -.ifdef EUR add r1, #0x3e -.endif -.ifdef JPN - add r1, #0x42 -.endif mov r2, #0xc blx func_020078c0 mov r0, #0 @@ -69254,12 +69048,7 @@ func_02032f0c: ; 0x02032f0c str r0, [r4, #0x34] add r0, r4, #0 pop {r4, pc} -.ifdef EUR nop -.endif -.ifdef JPN - .align 2, 0 -.endif thumb_func_end func_02032f0c _02032f80: .word data_020579c8 @@ -69299,12 +69088,7 @@ func_02032f98: ; 0x02032f98 arm_func_start func_02032fa4 func_02032fa4: ; 0x02032fa4 ldr ip, _02032fb0 ; =func_02035428 -.ifdef EUR ldrb r0, [r0, #0x50] -.endif -.ifdef JPN - ldrb r0, [r0, #0x51] -.endif bx ip .align 2, 0 arm_func_end func_02032fa4 @@ -69338,21 +69122,11 @@ func_02032fcc: ; 0x02032fcc mov lr, ip, lsl #0x3 add r3, r4, r3, lsr #29 mov ip, lr, asr #0x2 -.ifdef EUR strh r1, [r0, #0x4a] -.endif -.ifdef JPN - strh r1, [r0, #0x3e] -.endif mov r1, r3, lsl #0xd add r3, lr, ip, lsr #29 mov r3, r3, lsl #0xd -.ifdef EUR strb r2, [r0, #0x4c] -.endif -.ifdef JPN - strh r2, [r0, #0x40] -.endif mov r1, r1, lsr #0x10 str r1, [r0, #0x14] mov r1, r3, lsr #0x10 @@ -69367,14 +69141,9 @@ func_02033030: ; 0x02033030 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xc mov sl, r0 -.ifdef EUR mov r4, #1 strb r4, [sl, #0x51] ldrb r5, [sl, #0x4d] -.endif -.ifdef JPN - ldrb r5, [sl, #0x4e] -.endif mov r4, r1 mov sb, r2 add r1, r5, #0xff @@ -69384,24 +69153,14 @@ func_02033030: ; 0x02033030 bhi _02033084 mov r1, r8 bl func_02033cbc -.ifdef EUR ldrh r1, [sl, #0x4a] -.endif -.ifdef JPN - ldrh r1, [sl, #0x3e] -.endif add r0, r0, r0, lsr #31 add r1, r4, r1, lsr #1 sub r0, r1, r0, asr #1 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 _02033084: -.ifdef EUR ldrb r0, [sl, #0x4e] -.endif -.ifdef JPN - ldrb r0, [sl, #0x4f] -.endif cmp r0, #0 bne _020330cc str r8, [sp] @@ -69423,12 +69182,7 @@ _020330cc: cmp r0, #1 addne sp, sp, #0xc ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} -.ifdef EUR ldrb r1, [sl, #0x4f] -.endif -.ifdef JPN - ldrb r1, [sl, #0x50] -.endif ldrh r0, [r8] mov r7, #0 add r1, r4, r1, lsr #1 @@ -69452,12 +69206,7 @@ _02033100: bl func_02023eec str r5, [sp] ldrsb r1, [r0, #2] -.ifdef EUR ldrb r2, [sl, #0x4f] -.endif -.ifdef JPN - ldrb r2, [sl, #0x50] -.endif mov r0, sl ldr r6, [r0] mul r3, r2, r7 @@ -69531,15 +69280,10 @@ func_020331c4: ; 0x020331c4 func_02033214: ; 0x02033214 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x18 -.ifdef EUR mov r8, r0 mov r0, #1 strb r0, [r8, #0x51] -.endif ldr r4, [sp, #0x3c] -.ifdef JPN - mov r8, r0 -.endif add r0, sp, #4 mov r5, r1 mov r7, r2 @@ -69553,12 +69297,7 @@ func_02033214: ; 0x02033214 ldr r0, [sp] add r1, sp, #4 str r0, [sp, #8] -.ifdef EUR ldrb r3, [r8, #0x4d] -.endif -.ifdef JPN - ldrb r3, [r8, #0x4e] -.endif mov r0, r8 mvn r2, #0 str r3, [sp, #0x14] @@ -69586,12 +69325,10 @@ _020332a8: movne r1, sb cmp r1, #0 beq _0203328c -.ifdef EUR mov r0, r8 bl func_02033c6c cmp r0, #0 bne _0203328c -.endif add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 @@ -69678,7 +69415,6 @@ _020333b8: func_020333e0: ; 0x020333e0 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #8 -.ifdef EUR mov r6, r2 ldr r4, [r6] mov r7, r1 @@ -69686,14 +69422,7 @@ func_020333e0: ; 0x020333e0 ldrb r5, [r4, #3] ldrh r4, [r4, #4] ldr r2, _020334b0 ; =0x0001001e -.endif -.ifdef JPN - mov r5, r2 - mov r6, r1 - ldr r1, [r5] -.endif mov r8, r0 -.ifdef EUR orr r0, r4, r5, lsl #16 cmp r0, r2 moveq r0, #0 @@ -69702,11 +69431,6 @@ func_020333e0: ; 0x020333e0 ldr r1, [r1] mov r0, r8 mov r5, r3 -.endif -.ifdef JPN - mov r7, r3 - str r1, [sp, #4] -.endif mov r4, #1 bl func_02033b0c cmp r0, #0 @@ -69717,14 +69441,8 @@ func_020333e0: ; 0x020333e0 beq _02033468 ldr r4, [sp, #0x20] mov r0, r8 -.ifdef EUR mov r1, r7 mov r3, r5 -.endif -.ifdef JPN - mov r1, r6 - mov r3, r7 -.endif add r2, r8, #0xc str r4, [sp] bl func_02033628 @@ -69740,23 +69458,11 @@ _02033468: beq _0203349c add r0, sp, #4 bl func_020374b4 -.ifdef EUR ldrsh r1, [r7, #8] add r0, r1, r0 strh r0, [r7, #8] -.endif -.ifdef JPN - ldrsh r1, [r6, #8] - add r0, r1, r0 - strh r0, [r6, #8] -.endif _0203349c: -.ifdef EUR mov r0, r6 -.endif -.ifdef JPN - mov r0, r5 -.endif bl func_02037604 mov r0, r4 add sp, sp, #8 @@ -69768,14 +69474,8 @@ _020334b0: .word 0x0001001e .global func_020334b4 arm_func_start func_020334b4 func_020334b4: ; 0x020334b4 -.ifdef EUR stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} -.endif -.ifdef JPN - stmdb sp!, {r3, r4, r5, r6, r7, lr} -.endif sub sp, sp, #8 -.ifdef EUR mov sb, r0 mov r8, r1 mov r7, r2 @@ -69835,54 +69535,20 @@ _02033570: ldr r1, [sb, #0x2c] add r2, r2, r5 add r3, r6, r3 -.endif -.ifdef JPN - mov r4, r2 - ldrsh r2, [r4, #0xe] - mov r5, r1 - mov r6, r0 - stmia sp, {r2, r5} - ldrsh r0, [r4, #8] - ldrsh lr, [r4, #0xa] - ldr ip, [sp, #0x20] - add r2, r0, r3 - ldr r1, [r6, #0x2c] - add r0, r6, #0x10 - add r3, lr, ip -.endif bl func_020296e0 -.ifdef EUR ldr r6, [sb, #0x2c] mov r1, r8 mov r0, r6 ldr r5, [sb, #0x30] -.endif -.ifdef JPN - ldr r7, [r6, #0x2c] - mov r1, r5 - mov r0, r7 - ldr r5, [r6, #0x30] -.endif bl func_02023ea4 -.ifdef EUR ldr r2, _02033624 ; =0x0000ffff mov r1, r0 cmp r1, r2 ldreq r0, [r6] ldreqh r1, [r0, #2] mov r0, r6 -.endif -.ifdef JPN - ldr r2, _02033624 ; =0x0000ffff - mov r1, r0 - cmp r1, r2 - ldreq r0, [r7] - ldreqh r1, [r0, #2] - mov r0, r7 -.endif bl func_02023eec ldrsb r0, [r0, #2] -.ifdef EUR cmp r4, #0 ldrsh r1, [r7, #8] add r0, r0, r5 @@ -69902,19 +69568,11 @@ _02033570: streqb r0, [sb, #0x51] add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} -.endif -.ifdef JPN - strh r0, [r4, #8] - add sp, sp, #8 - ldmia sp!, {r3, r4, r5, r6, r7, pc} -.endif .align 2, 0 arm_func_end func_020334b4 -.ifdef EUR _02033618: .word data_02056fd0 _0203361c: .word data_020570d0 _02033620: .word 0x00000153 -.endif _02033624: .word 0x0000ffff .global func_02033628 @@ -70027,7 +69685,6 @@ func_02033780: ; 0x02033780 stmdb sp!, {r4, lr} mov r4, r1 ldr r1, [r4, #0x10] -.ifdef EUR cmp r1, #3 addls pc, pc, r1, lsl #2 ldmia sp!, {r4, pc} @@ -70036,16 +69693,6 @@ _02033798: ; jump table b _020337b4 ; case 1 b _020337c0 ; case 2 b _020337b4 ; case 3 -.endif -.ifdef JPN - cmp r1, #0 - beq _020337a8 - cmp r1, #1 - beq _020337b4 - cmp r1, #2 - beq _020337c0 - ldmia sp!, {r4, pc} -.endif _020337a8: ldrsh r0, [r4, #0xc] strh r0, [r4, #8] @@ -70150,12 +69797,7 @@ func_020338a8: ; 0x020338a8 arm_func_start func_020338d0 func_020338d0: ; 0x020338d0 stmdb sp!, {r3, lr} -.ifdef EUR ldrb r3, [r0, #0x4d] -.endif -.ifdef JPN - ldrb r3, [r0, #0x4e] -.endif cmp r3, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} @@ -70178,12 +69820,7 @@ func_02033904: ; 0x02033904 ldr r1, [r1] mov r4, r0 bl func_0203369c -.ifdef EUR ldrh r1, [r4, #0x4a] -.endif -.ifdef JPN - ldrh r1, [r4, #0x3e] -.endif sub r0, r1, r0 add r0, r0, r0, lsr #31 mov r0, r0, asr #0x1 @@ -70201,12 +69838,7 @@ func_02033938: ; 0x02033938 ldr r1, [r1] mov r4, r0 bl func_0203396c -.ifdef EUR ldrh r1, [r4, #0x4a] -.endif -.ifdef JPN - ldrh r1, [r4, #0x3e] -.endif sub r0, r1, r0 add r0, r0, r0, lsr #31 mov r0, r0, asr #0x1 @@ -70406,20 +70038,10 @@ _02033bcc: mov r4, r0 _02033bfc: mov r1, r4 -.ifdef EUR add r0, r5, #0x3e -.endif -.ifdef JPN - add r0, r5, #0x42 -.endif mov r2, r4, asr #0x1f bl func_ov00_020d16f0 -.ifdef EUR add r0, r5, #0x3e -.endif -.ifdef JPN - add r0, r5, #0x42 -.endif str r0, [r5, #0xc] mov r4, #1 _02033c18: @@ -74043,12 +73665,7 @@ _020365aa: _020365c4: mov r1, #0 _020365c6: -.ifdef EUR add r0, #0x50 -.endif -.ifdef JPN - add r0, #0x51 -.endif strb r1, [r0] b _0203662a _020365cc: @@ -74525,12 +74142,7 @@ _02036a80: ldr r1, _02036ba4 ; =data_027e077c ldr r2, _02036ba8 ; =data_02056be4 ldr r1, [r1] -.ifdef EUR ldrb r0, [r0, #0x50] -.endif -.ifdef JPN - ldrb r0, [r0, #0x51] -.endif ldrb r1, [r2, r1] tst r1, #1 movne r1, #1 @@ -74616,22 +74228,12 @@ _02036bf0: beq _02036c38 cmp r4, #0 beq _02036c14 -.ifdef EUR ldrb r1, [r0, #0x50] -.endif -.ifdef JPN - ldrb r1, [r0, #0x51] -.endif cmp r1, #0 beq _02036c24 _02036c14: cmp r5, #0 -.ifdef EUR ldrneb r1, [r0, #0x50] -.endif -.ifdef JPN - ldrneb r1, [r0, #0x51] -.endif cmpne r1, #0 beq _02036c38 _02036c24: @@ -75283,7 +74885,6 @@ _0203733a: add r1, r6, #0 add r2, r4, #0 bl func_020371c8 -.ifdef EUR mov r1, #0x1c add r2, r0, #0 ldr r4, [r5] @@ -75311,33 +74912,6 @@ _0203733a: ldr r1, [r5] add r1, r1, r2 strh r0, [r1, #0x1a] -.endif -.ifdef JPN - ldr r4, [r5] - mov r1, #0x1c - add r3, r0, #0 - mul r3, r1 - ldr r2, [sp, #8] - add r1, r4, r3 - str r2, [r4, r3] - ldr r2, [sp, #0xc] - add r3, sp, #8 - str r2, [r1, #4] - ldr r2, [sp, #0x10] - str r2, [r1, #8] - ldr r2, [sp, #0x14] - str r2, [r1, #0xc] - ldr r2, [sp, #0x18] - str r2, [r1, #0x10] - ldr r2, [sp, #0x1c] - str r2, [r1, #0x14] - mov r2, #0x18 - ldrsh r2, [r3, r2] - strh r2, [r1, #0x18] - mov r2, #0x1a - ldrsh r2, [r3, r2] - strh r2, [r1, #0x1a] -.endif add sp, #0x64 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -77329,12 +76903,7 @@ func_02038b78: ; 0x02038b78 ldrb r0, [r1] cmp r0, #0 bne _02038bd8 -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif cmp r0, #0 beq _02038bac ldr r0, _02038c28 ; =data_027e0c68 @@ -77342,12 +76911,7 @@ func_02038b78: ; 0x02038b78 cmp r0, #0 bne _02038bc8 _02038bac: -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif cmp r0, #0 bne _02038bd0 ldr r0, _02038c28 ; =data_027e0c68 @@ -77364,12 +76928,7 @@ _02038bd8: ldr r0, _02038c2c ; =data_027e077c ldr r1, _02038c30 ; =data_02056be4 ldr r0, [r0] -.ifdef EUR ldrb r2, [r4, #0x50] -.endif -.ifdef JPN - ldrb r2, [r4, #0x51] -.endif ldrb r0, [r1, r0] mov r1, #0 tst r0, #1 @@ -77911,40 +77470,20 @@ _020392ac: .global func_020392b4 arm_func_start func_020392b4 func_020392b4: ; 0x020392b4 -.ifdef EUR stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r1, #1 add r0, r5, #0x128 strb r1, [r5, #0x51] -.endif -.ifdef JPN - stmdb sp!, {r4, lr} - mov r4, r0 - add r0, r4, #0x128 -.endif bl func_02038888 -.ifdef EUR add r0, r5, #0x150 -.endif -.ifdef JPN - add r0, r4, #0x150 -.endif bl func_020387ec mov r2, #0 -.ifdef EUR str r2, [r5, #0xc] mov r0, r5 add r1, r5, #0x128 -.endif -.ifdef JPN - str r2, [r4, #0xc] - mov r0, r4 - add r1, r4, #0x128 -.endif sub r2, r2, #1 bl func_020338a8 -.ifdef EUR ldr r0, [r5, #0x154] cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -77981,42 +77520,16 @@ _0203934c: strh r0, [r1, #0x30] _0203936c: mov r0, r5 -.endif -.ifdef JPN - ldr r0, [r4, #0x154] - cmp r0, #0 - ldmeqia sp!, {r4, pc} - ldrb r2, [r0, #6] - ldr r1, [r4, #0x12c] - mov r0, r4 - bl func_020337fc - and r1, r0, #0xff - mov r0, r4 - strb r1, [r4, #0x150] -.endif ldr r2, [r0] -.ifdef EUR mov r1, r4 -.endif ldr r2, [r2, #0x68] blx r2 -.ifdef EUR add r1, r5, #0x100 -.endif -.ifdef JPN - add r1, r4, #0x100 -.endif strh r0, [r1, #0x32] ldrsb r0, [r1, #0x5f] add r0, r0, #1 -.ifdef EUR strb r0, [r5, #0x15f] ldmia sp!, {r3, r4, r5, pc} -.endif -.ifdef JPN - strb r0, [r4, #0x15f] - ldmia sp!, {r4, pc} -.endif arm_func_end func_020392b4 .global func_02039398 @@ -78766,12 +78279,7 @@ func_02039a3c: ; 0x02039a3c mov r0, #2 str r0, [sp] add r0, r4, #0 -.ifdef EUR add r4, #0x50 -.endif -.ifdef JPN - add r4, #0x51 -.endif mov r2, #0 ldrb r1, [r4] add r3, r2, #0 @@ -78795,12 +78303,7 @@ func_02039a5c: ; 0x02039a5c ldrb r0, [r1, r0] tst r0, #1 movne r1, #1 -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif moveq r1, #0 cmp r1, r0 ldmneia sp!, {r4, pc} @@ -78982,12 +78485,7 @@ func_02039ccc: ; 0x02039ccc ldrnesb r0, [r0, #0x29] cmpne r0, #3 ldmeqia sp!, {r4, pc} -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif cmp r0, #0 bne _02039d14 bl func_ov00_02079e04 @@ -79004,12 +78502,7 @@ _02039d14: ldrb r0, [r1, r0] tst r0, #1 movne r1, #1 -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif moveq r1, #0 cmp r1, r0 ldmneia sp!, {r4, pc} @@ -79031,12 +78524,7 @@ _02039d70: .word data_02056be4 arm_func_start func_02039d74 func_02039d74: ; 0x02039d74 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} -.ifdef EUR sub sp, sp, #0x88 -.endif -.ifdef JPN - sub sp, sp, #0x68 -.endif mov r3, #0 str r3, [sp, #0x24] str r3, [sp, #0x20] @@ -79044,12 +78532,7 @@ func_02039d74: ; 0x02039d74 ldr r3, [r0] mov sb, r1 mov r8, r2 -.ifdef EUR ldrb r5, [sl, #0x50] -.endif -.ifdef JPN - ldrb r5, [sl, #0x51] -.endif ldr r4, _0203a15c ; =data_027e0c68 ldr r3, [r3, #0x6c] add r1, sp, #0x24 @@ -79191,12 +78674,7 @@ _02039f54: bl func_0203a2c0 cmp r0, #0 beq _0203a0b4 -.ifdef EUR add r0, sp, #0x68 -.endif -.ifdef JPN - add r0, sp, #0x48 -.endif bl func_01ffbe34 ldr r0, _0203a17c ; =data_02056a10 mov r3, #4 @@ -79222,7 +78700,6 @@ _02039f54: str r1, [sp, #0x10] ldr r0, [r0, #0x10] cmp r0, #1 -.ifdef EUR bne _0203a04c blx func_0202ab48 cmp r0, #0 @@ -79232,12 +78709,6 @@ _02039f54: rsb r0, r0, #0x108 add r0, r0, r1 str r0, [sp, #0x14] -.endif -.ifdef JPN - subeq r0, r2, #0x80 - rsbeq r0, r0, #0x88 - streq r0, [sp, #0x14] -.endif _0203a04c: ldrb r0, [sl, #0x57f] cmp r0, #0 @@ -79246,21 +78717,14 @@ _0203a04c: ldrsh r0, [r0, #0x6c] cmp r0, #0 bgt _0203a090 -.ifdef EUR add r0, sp, #0x48 bl func_01ffbe34 mov r0, #1 strb r0, [sp, #0x52] -.endif ldr r1, [sp, #0x14] ldr r2, [sp, #0x10] -.ifdef EUR add r3, sp, #0x48 -.endif add r0, sl, #0x1f0 -.ifdef JPN - mov r3, #0 -.endif bl func_02034a1c b _0203a0b4 _0203a090: @@ -79276,12 +78740,7 @@ _0203a090: _0203a0b4: ldr r0, [sl, #8] cmp r0, #0 -.ifdef EUR addeq sp, sp, #0x88 -.endif -.ifdef JPN - addeq sp, sp, #0x68 -.endif ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldrb r0, [r0, #0x1c] cmp r0, #1 @@ -79293,25 +78752,15 @@ _0203a0dc: mov r0, #0 _0203a0e0: cmp r0, #0 -.ifdef EUR addeq sp, sp, #0x88 -.endif -.ifdef JPN - addeq sp, sp, #0x68 -.endif ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} add r0, sp, #0x28 bl func_01ffbe34 mov r0, #1 strb r0, [sp, #0x32] cmp r4, #0 -.ifdef EUR rsbne r0, r0, #0x120 moveq r0, #0x18 -.endif -.ifdef JPN - ldrne r0, _0203a184 -.endif add r2, sp, #0xc add r3, sp, #8 mov r1, #2 @@ -79331,12 +78780,7 @@ _0203a0e0: str r1, [sp, #0xc] str r2, [sp, #8] bl func_02034a1c -.ifdef EUR add sp, sp, #0x88 -.endif -.ifdef JPN - add sp, sp, #0x68 -.endif ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 arm_func_end func_02039d74 @@ -79345,22 +78789,12 @@ _0203a160: .word data_027e077c _0203a164: .word data_02056be4 _0203a168: .word data_027e0618 _0203a16c: .word data_027e0cbc -.ifdef EUR _0203a170: .word 0x0000013b -.endif -.ifdef JPN -_0203a170: .word 0x0000013a -.endif _0203a174: .word data_02056a04 _0203a178: .word data_02056a16 _0203a17c: .word data_02056a10 _0203a180: .word data_027e0c38 -.ifdef EUR _0203a184: .word 0x0000011f -.endif -.ifdef JPN -_0203a184: .word 0x0000011e -.endif .global func_0203a188 arm_func_start func_0203a188 @@ -79375,12 +78809,7 @@ func_0203a188: ; 0x0203a188 cmp r0, #7 addeq sp, sp, #0x34 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} -.ifdef EUR ldrb r2, [sl, #0x50] -.endif -.ifdef JPN - ldrb r2, [sl, #0x51] -.endif ldr r0, _0203a2a4 ; =data_027e0c68 mov r1, #0x18 ldrb r3, [r0, r2] @@ -79615,12 +79044,7 @@ _0203a488: ldrh r1, [r0, #0x34] tst r1, #1 beq _0203a558 -.ifdef EUR ldrb r0, [r6, #0x50] -.endif -.ifdef JPN - ldrb r0, [r6, #0x51] -.endif cmp r0, #0 bne _0203a520 ldr r0, _0203a6c4 ; =data_027e0d38 @@ -79971,29 +79395,16 @@ func_0203a988: ; 0x0203a988 ldr r3, [r3, #0x14] mov r2, #0x40 blx r3 -.ifdef EUR ldr r0, [r6, #0x154] mov r2, #0 cmp r0, #0 ldrnesb r0, [r0, #5] moveq r0, #2 -.endif -.ifdef JPN - mov r0, #2 -.endif str r0, [sp] add r0, r6, #0x100 -.ifdef JPN - ldrb r1, [r6, #0x51] -.endif ldrsb r3, [r0, #0x1e] -.ifdef EUR ldrb r1, [r6, #0x50] -.endif mov r0, r6 -.ifdef JPN - mov r2, #0 -.endif bl func_0203dcfc _0203a9e4: add r0, r6, #0x410 @@ -80073,12 +79484,7 @@ _0203aaf4: ldrsh r1, [r1, #0x6e] cmp r1, #0 bne _0203ab38 -.ifdef EUR ldrb r1, [r6, #0x50] -.endif -.ifdef JPN - ldrb r1, [r6, #0x51] -.endif bl func_0203cabc mov r2, #0 mov r1, #0x1a @@ -80184,7 +79590,6 @@ _0203ac78: mov r1, #0 strh r1, [r0, #0x72] b _0203ad24 -.ifdef EUR _0203ac8c: ldr r0, _0203ae94 ; =data_027e103c ldr r0, [r0] @@ -80199,7 +79604,6 @@ _0203ac8c: add r1, r2, #4 bl func_ov05_02103f8c b _0203ad24 -.endif _0203acc0: ldrh r2, [r5, #6] ldr r0, _0203ae9c ; =data_027e0e60 @@ -80251,29 +79655,16 @@ _0203ad4c: ldr r3, [r3, #0x14] mov r2, #0x30 blx r3 -.ifdef EUR ldr r0, [r6, #0x154] mov r2, #0 cmp r0, #0 ldrnesb r0, [r0, #5] moveq r0, #2 -.endif -.ifdef JPN - mov r0, #2 -.endif str r0, [sp] add r0, r6, #0x100 -.ifdef JPN - ldrb r1, [r6, #0x51] -.endif ldrsb r3, [r0, #0x1e] -.ifdef EUR ldrb r1, [r6, #0x50] -.endif mov r0, r6 -.ifdef JPN - mov r2, #0 -.endif bl func_0203dcfc _0203ada0: ldrb r0, [r6, #0x580] @@ -80285,36 +79676,18 @@ _0203ada0: ldr r3, [r3, #0x14] mov r2, #0x28 blx r3 -.ifdef EUR ldr r0, [r6, #0x154] mov r2, #0 cmp r0, #0 ldrnesb r0, [r0, #5] moveq r0, #2 -.endif -.ifdef JPN - mov r0, #2 -.endif str r0, [sp] add r0, r6, #0x100 ldrsb r3, [r0, #0x1e] -.ifdef EUR ldrb r1, [r6, #0x50] -.endif -.ifdef JPN - ldrb r1, [r6, #0x51] -.endif mov r0, r6 -.ifdef JPN - mov r2, #0 -.endif bl func_0203dcfc -.ifdef EUR ldrb r2, [r6, #0x50] -.endif -.ifdef JPN - ldrb r2, [r6, #0x51] -.endif ldr r1, _0203aea4 ; =data_027e0c68 mov r0, r6 cmp r2, #0 @@ -80361,9 +79734,7 @@ _0203ae88: .word 0x00010017 _0203ae8c: .word 0x00020001 _0203ae90: .word 0xffff0001 _0203ae94: .word data_027e103c -.ifdef EUR _0203ae98: .word data_027e0d3c -.endif _0203ae9c: .word data_027e0e60 _0203aea0: .word data_02057ed0 _0203aea4: .word data_027e0c68 @@ -80554,12 +79925,7 @@ func_0203b0ec: ; 0x0203b0ec mov r5, r4 tst r0, #1 movne r1, #1 -.ifdef EUR ldrb r0, [r8, #0x50] -.endif -.ifdef JPN - ldrb r0, [r8, #0x51] -.endif moveq r1, #0 cmp r0, r1 moveq r6, #1 @@ -80836,12 +80202,7 @@ _0203b4b0: movne r4, #7 moveq r4, #6 _0203b4c0: -.ifdef EUR ldrb r2, [r6, #0x50] -.endif -.ifdef JPN - ldrb r2, [r6, #0x51] -.endif ldr r1, _0203b5ac ; =data_027e0c68 add r0, r6, #0x100 strb r4, [r1, r2] @@ -80921,12 +80282,7 @@ func_0203b5d0: ; 0x0203b5d0 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #8 mov r5, r0 -.ifdef EUR ldrb r2, [r5, #0x50] -.endif -.ifdef JPN - ldrb r2, [r5, #0x51] -.endif mov r4, r1 cmp r2, #0 bne _0203b628 @@ -81037,12 +80393,7 @@ _0203b760: .word data_027e0f74 func_0203b764: ; 0x0203b764 stmdb sp!, {r4, lr} mov r4, r0 -.ifdef EUR ldrb r3, [r4, #0x50] -.endif -.ifdef JPN - ldrb r3, [r4, #0x51] -.endif ldr r2, _0203b808 ; =data_027e0c68 mov r1, #0x18 ldrb ip, [r2, r3] @@ -81585,12 +80936,7 @@ _0203bed0: ldrb r0, [r1, r0] tst r0, #1 movne r1, #1 -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif moveq r1, #0 cmp r1, r0 bne _0203bf1c @@ -81633,12 +80979,7 @@ _0203bf68: ldr r0, [r0] cmp r0, #6 beq _0203c000 -.ifdef EUR ldrb r0, [r4, #0x50] -.endif -.ifdef JPN - ldrb r0, [r4, #0x51] -.endif cmp r0, #0 bne _0203bfcc ldr r0, _0203c07c ; =data_027e0f74 @@ -81708,12 +81049,7 @@ _0203c080: .word data_027e0db0 arm_func_start func_0203c084 func_0203c084: ; 0x0203c084 stmdb sp!, {r3, r4, r5, r6, r7, lr} -.ifdef EUR ldrb r0, [r0, #0x50] -.endif -.ifdef JPN - ldrb r0, [r0, #0x51] -.endif mov r4, #0 cmp r0, #0 bne _0203c120 @@ -82089,12 +81425,7 @@ func_0203c460: ; 0x0203c460 func_0203c4ac: ; 0x0203c4ac stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 -.ifdef EUR ldrb r4, [sl, #0x50] -.endif -.ifdef JPN - ldrb r4, [sl, #0x51] -.endif ldr r3, _0203c5ac ; =data_027e0c68 add r0, sl, #0x100 ldrb fp, [r3, r4] @@ -82189,12 +81520,7 @@ func_0203c5dc: ; 0x0203c5dc mov r5, #0 mov r6, r5 mov r7, fp -.ifdef EUR strb r3, [sl, #0x50] -.endif -.ifdef JPN - strb r3, [sl, #0x51] -.endif cmp fp, sb bhs _0203c648 ldr r4, _0203c6f8 ; =0x0000ffff @@ -82501,13 +81827,8 @@ _0203c9bc: bl func_0203ca20 b _0203ca00 _0203c9d4: -.ifdef JPN - ldr r1, _0203ca1c ; =0x00000123 -.endif mov r0, r4 -.ifdef EUR mov r1, #0x124 -.endif mov r2, #1 mov r3, #0 bl func_0203ca20 @@ -82527,14 +81848,8 @@ _0203ca00: ldmia sp!, {r4, pc} .align 2, 0 arm_func_end func_0203c904 -.ifdef EUR _0203ca18: .word 0x00000123 _0203ca1c: .word 0x00000125 -.endif -.ifdef JPN -_0203ca18: .word 0x00000122 -_0203ca1c: .word 0x00000123 -.endif .global func_0203ca20 arm_func_start func_0203ca20 @@ -82608,48 +81923,29 @@ func_0203cabc: ; 0x0203cabc .global func_0203cb00 arm_func_start func_0203cb00 func_0203cb00: ; 0x0203cb00 -.ifdef EUR stmdb sp!, {r3, lr} -.endif ldr r2, [r1] mov r0, #1 ldrh r1, [r2] cmp r1, #0xa -.ifdef EUR ldmeqia sp!, {r3, pc} -.endif -.ifdef JPN - bxeq lr -.endif cmp r1, #0x1a mov ip, #0 bne _0203cb4c ldrb r3, [r2, #3] ldrh r2, [r2, #4] ldr r1, _0203cb58 ; =0x00ff0002 -.ifdef EUR mov lr, ip -.endif orr r2, r2, r3, lsl #16 cmp r2, r1 -.ifdef EUR cmpne r2, #0xff0000 movne lr, r0 cmp lr, #0 movne ip, #1 -.endif -.ifdef JPN - movne ip, r0 -.endif _0203cb4c: cmp ip, #0 moveq r0, #0 -.ifdef EUR ldmia sp!, {r3, pc} -.endif -.ifdef JPN - bx lr -.endif .align 2, 0 arm_func_end func_0203cb00 _0203cb58: .word 0x00ff0002 @@ -82775,12 +82071,7 @@ _0203ccd4: add r0, r8, #1 subs r1, r1, r0 bmi _0203cd34 -.ifdef EUR ldrb r0, [sl, #0x50] -.endif -.ifdef JPN - ldrb r0, [sl, #0x51] -.endif mov r1, r1, lsl #0x10 mov r1, r1, lsr #0x10 cmp r0, #0 @@ -84371,22 +83662,11 @@ func_0203dcfc: ; 0x0203dcfc stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 -.ifdef EUR strb r1, [r6, #0x50] -.endif -.ifdef JPN - strb r1, [r6, #0x51] -.endif ldr ip, [r0] mov r5, r2 -.ifdef EUR ldrh r1, [r6, #0x4a] ldrb r2, [r6, #0x4c] -.endif -.ifdef JPN - ldrh r1, [r6, #0x3e] - ldrh r2, [r6, #0x40] -.endif ldr ip, [ip, #0x14] mov r4, r3 blx ip @@ -84468,12 +83748,7 @@ func_0203ddfc: ; 0x0203ddfc arm_func_start func_0203de14 func_0203de14: ; 0x0203de14 ldr ip, _0203de20 ; =func_02035440 -.ifdef EUR ldrb r0, [r0, #0x50] -.endif -.ifdef JPN - ldrb r0, [r0, #0x51] -.endif bx ip .align 2, 0 arm_func_end func_0203de14 @@ -85782,12 +85057,7 @@ _0203ed44: beq _0203edd0 ldr r2, [r5] ldr r0, [r5, #8] -.ifdef EUR ldrb r3, [r2, #0x50] -.endif -.ifdef JPN - ldrb r3, [r2, #0x51] -.endif mov r2, r6 bl func_0203c5dc cmp r0, #0 @@ -86465,12 +85735,7 @@ func_0203f634: ; 0x0203f634 ldrsh r0, [r0, #0x5c] cmp r0, #0 ldmleia sp!, {r3, pc} -.ifdef EUR ldrb r3, [r3, #0x50] -.endif -.ifdef JPN - ldrb r3, [r3, #0x51] -.endif ldr r0, _0203f664 ; =data_027e0c38 mov r1, #4 bl func_02033e70 @@ -105193,13 +104458,11 @@ _0204c6d0: b _0204c69c arm_func_end func_0204c68c -.ifdef EUR .global func_0204c6d8 arm_func_start func_0204c6d8 func_0204c6d8: ; 0x0204c6d8 bx lr arm_func_end func_0204c6d8 -.endif .global func_0204c6dc arm_func_start func_0204c6dc @@ -108810,8 +108073,7 @@ _0204f658: bne _0204f658 add sp, fp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, fp, pc} -_0204f674: - ldr r3, [fp, #0x3c] + ldr r3, [fp, #0x38] mov r0, r7 mov r1, r8 mov r2, r5 @@ -108857,7 +108119,6 @@ _0204f6f0: bne _0204f6f0 add sp, fp, #0x30 ldmia sp!, {r4, r5, r6, r7, fp, pc} -.ifdef EUR _0204f70c: str sp, [fp, #0x14] subs r7, r7, #0x1 @@ -108909,7 +108170,6 @@ _0204f79c: bl func_0204f444 add sp, fp, #0x18 ldmia sp!, {r4, r5, r6, r7, fp, pc} -.endif arm_func_end func_0204f754 .global func_0204f7b0 @@ -111444,9 +110704,7 @@ func_02050d70: ; 0x02050d70 ldr r0, _02050d84 ; =data_027e08f8 mov r1, #0 strb r1, [r0] -.ifdef EUR strb r1, [r0, #1] -.endif bx lr .align 2, 0 arm_func_end func_02050d70 @@ -139489,11 +138747,9 @@ data_02056c24: ; 0x02056c24 .global data_02056c25 data_02056c25: ; 0x02056c25 .byte 0x1e, 0x10, 0x00, 0x06, 0x00, 0x04, 0x04, 0xf0, 0xf0, 0x00, 0x00 -.ifdef EUR .global data_02056c30 data_02056c30: ; 0x02056c30 .byte 0xa0, 0x80, 0x05, 0x02 -.endif .global data_02056c34 data_02056c34: ; 0x02056c34 .byte 0xc5, 0x0f, 0x04, 0x02 @@ -140647,16 +139903,6 @@ data_0205765c: ; 0x0205765c .ascii "%s %s" .byte 0x00, 0x00, 0x00 .global data_02057664 -.ifdef JPN - .global data_02057664_jpn -data_02057664_jpn: - .ascii "May 17 2007" - .byte 0x00 - .global data_02057670_jpn -data_02057670_jpn: - .ascii "23:34:26" - .byte 0x00, 0x00, 0x00, 0x00 -.endif data_02057664: ; 0x02057664 .ascii "SysFile.cpp" .byte 0x00