From ea0165eb26672be62fa17afc5bc4e9a32990f880 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 8 Apr 2024 20:29:55 +0200 Subject: [PATCH] Label `string.h` functions --- asm/main.s | 144 ++++----- asm/ov00/Item/ItemManager.inc | 2 +- asm/ov00/Item/ItemManager.s | 12 +- asm/ov00/ov00_020773c0.inc | 2 +- asm/ov00/ov00_020773c0.s | 2 +- asm/ov00/ov00_0207af9c.inc | 6 +- asm/ov00/ov00_0207af9c.s | 38 +-- asm/ov00/ov00_020b1498.inc | 6 +- asm/ov00/ov00_020b1498.s | 38 +-- asm/ov03.inc | 6 +- asm/ov03.s | 8 +- asm/ov04.inc | 6 +- asm/ov04.s | 24 +- asm/ov05.inc | 4 +- asm/ov05.s | 6 +- asm/ov09.inc | 4 +- asm/ov09.s | 18 +- asm/ov11.inc | 6 +- asm/ov11.s | 22 +- asm/ov12.inc | 2 +- asm/ov12.s | 4 +- asm/ov13.inc | 4 +- asm/ov13.s | 8 +- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 2 +- asm/ov14/ov14_0213b778.inc | 4 +- asm/ov14/ov14_0213b778.s | 10 +- asm/ov15.inc | 4 +- asm/ov15.s | 28 +- asm/ov19.inc | 2 +- asm/ov19.s | 10 +- asm/ov20.inc | 2 +- asm/ov20.s | 2 +- asm/ov22.inc | 2 +- asm/ov22.s | 4 +- asm/ov23.inc | 2 +- asm/ov23.s | 2 +- asm/ov24.inc | 2 +- asm/ov24.s | 4 +- asm/ov25.inc | 2 +- asm/ov25.s | 4 +- asm/ov26.inc | 4 +- asm/ov26.s | 6 +- asm/ov28.inc | 6 +- asm/ov28.s | 42 +-- asm/ov29.inc | 2 +- asm/ov29.s | 10 +- asm/ov32.inc | 2 +- asm/ov32.s | 4 +- asm/ov33.inc | 2 +- asm/ov33.s | 4 +- asm/ov34.inc | 4 +- asm/ov34.s | 10 +- asm/ov35.inc | 2 +- asm/ov35.s | 2 +- asm/ov36.inc | 2 +- asm/ov36.s | 4 +- asm/ov37.inc | 2 +- asm/ov37.s | 4 +- asm/ov38.inc | 2 +- asm/ov38.s | 2 +- asm/ov39.inc | 2 +- asm/ov39.s | 4 +- asm/ov40.inc | 8 +- asm/ov40.s | 46 +-- asm/ov42.inc | 4 +- asm/ov42.s | 6 +- asm/ov44.inc | 2 +- asm/ov44.s | 2 +- asm/ov48.inc | 2 +- asm/ov48.s | 8 +- asm/ov49.inc | 2 +- asm/ov49.s | 4 +- asm/ov51.inc | 2 +- asm/ov51.s | 2 +- asm/ov52.inc | 2 +- asm/ov52.s | 2 +- asm/ov61.inc | 16 +- asm/ov61.s | 558 +++++++++++++++++----------------- libs/c/include/string.h | 13 + 80 files changed, 637 insertions(+), 624 deletions(-) create mode 100644 libs/c/include/string.h diff --git a/asm/main.s b/asm/main.s index 58da0628..28ab0a5e 100644 --- a/asm/main.s +++ b/asm/main.s @@ -30200,7 +30200,7 @@ _02016f54: str r4, [r0, #0x60] str r5, [r0, #0x64] ldr r0, [sp, #0x14] - blx func_02047008 + blx strlen add r2, r0, #0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] @@ -63726,7 +63726,7 @@ func_0202f4b4: ; 0x0202f4b4 ldr r1, [r4] add r0, sp, #8 mov r2, #0x3f - blx func_020470ec + blx strncpy mov r0, #0 add r1, sp, #0x48 strb r0, [r1] @@ -65384,12 +65384,12 @@ func_02030220: ; 0x02030220 .global func_02030234 arm_func_start func_02030234 func_02030234: ; 0x02030234 - ldr ip, _02030240 ; =func_020470ec + ldr ip, _02030240 ; =strncpy mov r2, #0xc bx ip .align 2, 0 arm_func_end func_02030234 -_02030240: .word func_020470ec +_02030240: .word strncpy .global func_02030244 arm_func_start func_02030244 @@ -67993,11 +67993,11 @@ func_02031e1c: ; 0x02031e1c add r4, r1, #0 str r0, [r5, #8] add r0, r4, #0 - blx func_02047008 + blx strlen add r6, r0, #0 add r0, sp, #0 add r1, r4, #0 - blx func_02047024 + blx strcpy ldr r0, _02031eb4 ; =data_020578fc add r7, sp, #0 ldrb r1, [r0] @@ -68218,12 +68218,12 @@ func_02031fc4: ; 0x02031fc4 bl func_0202ab38 add r1, r0, #0 add r0, r4, #0 - blx func_02047024 + blx strcpy cmp r5, #0 beq _02031fe4 add r0, r4, #0 add r1, r5, #0 - blx func_0204713c + blx strcat _02031fe4: pop {r3, r4, r5, pc} nop @@ -71087,7 +71087,7 @@ func_02033f6c: ; 0x02033f6c blx func_0202ab38 mov r1, r0 mov r0, r4 - bl func_02047024 + bl strcpy _02033fac: ldrsh r1, [r5, #0x14] ldr r0, _02033ff8 ; =data_02068cbc @@ -71097,16 +71097,16 @@ _02033fac: ldreq r1, _02034000 ; =data_02057ac0 mov r0, r4 ldrne r1, _02034004 ; =data_02057ad0 - bl func_0204713c + bl strcat ldrsh r2, [r5, #0x14] ldr r1, _02033ff8 ; =data_02068cbc mov r0, r4 ldr r1, [r1, r2, lsl #2] ldr r1, [r1] - bl func_0204713c + bl strcat ldr r1, _02034008 ; =data_02057ae0 mov r0, r4 - bl func_0204713c + bl strcat ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_02033f6c @@ -71250,10 +71250,10 @@ _02034178: add r0, sp, #0 ldr r1, [r1, r2, lsl #2] ldr r1, [r1] - bl func_0204713c + bl strcat ldr r1, _020341dc ; =data_02057af0 add r0, sp, #0 - bl func_0204713c + bl strcat add r0, sp, #0 mov r1, r4 add r2, r4, #4 @@ -71291,10 +71291,10 @@ _02034200: add r0, sp, #0 ldr r1, [r1, r2, lsl #2] ldr r1, [r1] - bl func_0204713c + bl strcat ldr r1, _020342ac ; =data_02057af8 add r0, sp, #0 - bl func_0204713c + bl strcat mvn r0, #0 cmp r4, r0 beq _02034268 @@ -71401,10 +71401,10 @@ _02034374: add r0, sp, #0 ldr r1, [r1, r2, lsl #2] ldr r1, [r1] - bl func_0204713c + bl strcat ldr r1, _0203440c ; =data_02057b00 add r0, sp, #0 - bl func_0204713c + bl strcat ldr r0, [r4, #8] add r1, sp, #0 mov r2, r4 @@ -71454,10 +71454,10 @@ _02034428: add r0, sp, #4 ldr r1, [r1, r2, lsl #2] ldr r1, [r1] - bl func_0204713c + bl strcat ldr r1, _020344a4 ; =data_02057b08 add r0, sp, #4 - bl func_0204713c + bl strcat ldrsh r3, [r4, #0x14] ldrb r2, [r4, #0x16] ldr r1, _020344a0 ; =data_02068cbc @@ -71608,7 +71608,7 @@ _020345ec: subs r2, r2, #1 bne _020345ec add r0, sp, #0 - bl func_02047008 + bl strlen ldrb r8, [r4, #8] mov r7, r0 mov sb, #0 @@ -71619,7 +71619,7 @@ _020345ec: _02034630: ldr r1, [r5, #4] add r0, r4, r7 - bl func_02047024 + bl strcpy ldr r1, [r5], #8 mov r0, r6 bl func_02034538 @@ -73037,9 +73037,9 @@ func_020356a0: ; 0x020356a0 mov r5, r0 add r0, sp, #0 str r2, [r5] - bl func_02047024 + bl strcpy add r0, sp, #0 - bl func_02047008 + bl strlen ldr ip, _020357c4 ; =data_02057b60 add lr, sp, #0 ldrb r3, [ip] @@ -75572,18 +75572,18 @@ func_020372f0: ; 0x020372f0 bl func_0202ab38 add r1, r0, #0 add r0, sp, #0x24 - blx func_02047024 + blx strcpy ldr r1, _020373a0 ; =data_02057ca4 add r0, sp, #0x24 - blx func_0204713c + blx strcat ldr r1, _020373a4 ; =data_02056958 lsl r2, r6, #2 ldr r1, [r1, r2] add r0, sp, #0x24 - blx func_0204713c + blx strcat ldr r1, _020373a8 ; =data_02057cb0 add r0, sp, #0x24 - blx func_0204713c + blx strcat ldr r0, _020373ac ; =data_027e0ce0 cmp r4, #1 ldr r1, [r0, #4] @@ -94428,7 +94428,7 @@ func_02043494: ; 0x02043494 mov r8, r0 mov r0, r7 mov r6, r2 - bl func_02047008 + bl strlen mov r5, r0 cmp r8, #0 mov r4, #0 @@ -94491,7 +94491,7 @@ _02043540: mov r1, r6 mov r2, r5 add r0, r4, r7 - bl func_020470ec + bl strncpy add r7, r7, r5 cmp r7, r8 bls _02043540 @@ -96433,12 +96433,12 @@ func_02044f7c: ; 0x02044f7c _02044fac: mov r0, fp mov r1, #0x25 - bl func_020472b4 + bl strchr str r0, [sp, #0xc] cmp r0, #0 bne _02045000 mov r0, fp - bl func_02047008 + bl strlen movs r2, r0 add sl, sl, r2 beq _02045784 @@ -96816,7 +96816,7 @@ _020454ec: b _02045634 _02045518: mov r0, r7 - bl func_02047008 + bl strlen mov r6, r0 b _02045634 _02045528: @@ -96880,7 +96880,7 @@ _020455d4: b _02045634 _020455e8: ldr r0, [sp, #0xc] - bl func_02047008 + bl strlen movs r4, r0 beq _02045620 ldr r1, [sp, #0xc] @@ -98848,9 +98848,9 @@ _02046ffc: .word data_02076968 _02047000: .word data_0207698c _02047004: .word data_02076d8c - .global func_02047008 - arm_func_start func_02047008 -func_02047008: ; 0x02047008 + .global strlen + arm_func_start strlen +strlen: ; 0x02047008 mvn r2, #0 _0204700c: ldrsb r1, [r0], #1 @@ -98859,11 +98859,11 @@ _0204700c: bne _0204700c mov r0, r2 bx lr - arm_func_end func_02047008 + arm_func_end strlen - .global func_02047024 - arm_func_start func_02047024 -func_02047024: ; 0x02047024 + .global strcpy + arm_func_start strcpy +strcpy: ; 0x02047024 stmdb sp!, {r3, r4, r5, lr} and r4, r1, #3 and r3, r0, #3 @@ -98919,13 +98919,13 @@ _020470d0: bne _020470d0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 - arm_func_end func_02047024 + arm_func_end strcpy _020470e4: .word 0xfefefeff _020470e8: .word 0x80808080 - .global func_020470ec - arm_func_start func_020470ec -func_020470ec: ; 0x020470ec + .global strncpy + arm_func_start strncpy +strncpy: ; 0x020470ec stmdb sp!, {r3, lr} mov lr, r0 cmp r2, #0 @@ -98949,11 +98949,11 @@ _02047130: subs r2, r2, #1 bne _020470fc ldmia sp!, {r3, pc} - arm_func_end func_020470ec + arm_func_end strncpy - .global func_0204713c - arm_func_start func_0204713c -func_0204713c: ; 0x0204713c + .global strcat + arm_func_start strcat +strcat: ; 0x0204713c mov r3, r0 _02047140: ldrsb r2, [r3], #1 @@ -98968,11 +98968,11 @@ _02047150: cmp r2, #0 bne _02047150 bx lr - arm_func_end func_0204713c + arm_func_end strcat - .global func_0204716c - arm_func_start func_0204716c -func_0204716c: ; 0x0204716c + .global strcmp + arm_func_start strcmp +strcmp: ; 0x0204716c stmdb sp!, {r4, lr} ldrb r2, [r0] ldrb r3, [r1] @@ -99049,13 +99049,13 @@ _02047254: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 - arm_func_end func_0204716c + arm_func_end strcmp _02047278: .word 0xfefefeff _0204727c: .word 0x80808080 - .global func_02047280 - arm_func_start func_02047280 -func_02047280: ; 0x02047280 + .global strncmp + arm_func_start strncmp +strncmp: ; 0x02047280 cmp r2, #0 beq _020472ac _02047288: @@ -99071,11 +99071,11 @@ _02047288: _020472ac: mov r0, #0 bx lr - arm_func_end func_02047280 + arm_func_end strncmp - .global func_020472b4 - arm_func_start func_020472b4 -func_020472b4: ; 0x020472b4 + .global strchr + arm_func_start strchr +strchr: ; 0x020472b4 ldrsb r2, [r0], #1 mov r1, r1, lsl #0x18 mov r1, r1, asr #0x18 @@ -99093,11 +99093,11 @@ _020472e0: movne r0, #0 subeq r0, r0, #1 bx lr - arm_func_end func_020472b4 + arm_func_end strchr - .global func_020472f0 - arm_func_start func_020472f0 -func_020472f0: ; 0x020472f0 + .global strstr + arm_func_start strstr +strstr: ; 0x020472f0 stmdb sp!, {r4, lr} cmp r1, #0 ldrneb r2, [r1] @@ -99130,7 +99130,7 @@ _02047348: _02047354: mov r0, #0 ldmia sp!, {r4, pc} - arm_func_end func_020472f0 + arm_func_end strstr .global func_0204735c arm_func_start func_0204735c @@ -102891,11 +102891,11 @@ _0204a608: streqb r0, [r8, #-1]! _0204a638: mov r0, r8 - bl func_02047008 + bl strlen sub r1, sb, r0, lsl #1 mov r0, r8 sub r4, r1, #2 - bl func_02047008 + bl strlen mov r2, r0 mov r0, r4 mov r1, r8 @@ -103352,7 +103352,7 @@ _0204ac8c: b _0204acc4 _0204acb8: mov r0, r5 - bl func_02047008 + bl strlen mov r6, r0 _0204acc4: add r0, sp, #0x30 @@ -106953,7 +106953,7 @@ func_0204dd9c: ; 0x0204dd9c mov r0, r4 str r1, [sp, #4] add r5, sp, #8 - bl func_02047008 + bl strlen add r0, r0, #1 rsb r0, r0, r0, lsl #1 bl func_0202e9bc @@ -106967,7 +106967,7 @@ func_0204dd9c: ; 0x0204dd9c bl func_0204db80 ldr r0, [r5] mov r1, r4 - bl func_02047024 + bl strcpy ldr r3, _0204de20 ; =data_020587f0 ldr r0, _0204de24 ; =data_02058824 ldr r2, _0204de28 ; =func_0204dd08 @@ -108963,7 +108963,7 @@ func_0204f7e8: ; 0x0204f7e8 beq _0204f808 ldr r0, [r0, #4] ldr r1, [r1, #4] - bl func_0204716c + bl strcmp cmp r0, #0 bne _0204f810 _0204f808: diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index 504849c3..c97c5129 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -12,7 +12,7 @@ .extern data_ov00_020eec68 .extern func_020196bc .extern func_020196fc -.extern func_0204713c +.extern strcat .extern func_ov00_02079ffc .extern func_ov00_02084b08 .extern func_ov00_02084b14 diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s index e2a2a4a6..e3e15022 100644 --- a/asm/ov00/Item/ItemManager.s +++ b/asm/ov00/Item/ItemManager.s @@ -149,25 +149,25 @@ _020adc2a: ldr r1, _020adc94 ; =data_ov00_020e5df8 add r0, sp, #0x8c ldr r1, [r1, #0x10] - blx func_0204713c + blx strcat add r0, sp, #0x8c add r1, r4, #0 - blx func_0204713c + blx strcat ldr r1, _020adc94 ; =data_ov00_020e5df8 add r0, sp, #0x8c ldr r1, [r1, #0x14] - blx func_0204713c + blx strcat ldr r1, _020adc94 ; =data_ov00_020e5df8 add r0, sp, #0xc ldr r1, [r1, #0x10] - blx func_0204713c + blx strcat add r0, sp, #0xc add r1, r4, #0 - blx func_0204713c + blx strcat ldr r1, _020adc94 ; =data_ov00_020e5df8 add r0, sp, #0xc ldr r1, [r1, #0x18] - blx func_0204713c + blx strcat mov r3, #0 str r3, [sp] str r3, [sp, #4] diff --git a/asm/ov00/ov00_020773c0.inc b/asm/ov00/ov00_020773c0.inc index c5b7c77e..e09e6fd2 100644 --- a/asm/ov00/ov00_020773c0.inc +++ b/asm/ov00/ov00_020773c0.inc @@ -127,7 +127,7 @@ .extern func_020426d4 .extern func_02042bb8 .extern func_0204366c -.extern func_02047280 +.extern strncmp .extern func_0204f8d4 .extern func_ov00_0207bc48 .extern func_ov00_0207c170 diff --git a/asm/ov00/ov00_020773c0.s b/asm/ov00/ov00_020773c0.s index edb2daff..27673cf9 100644 --- a/asm/ov00/ov00_020773c0.s +++ b/asm/ov00/ov00_020773c0.s @@ -3752,7 +3752,7 @@ _02078e5e: add r1, r4, #0 mov r2, #0x40 mov r6, #1 - blx func_02047280 + blx strncmp cmp r0, #0 bne _02078e7e ldr r0, _02078f2c ; =gOverlayManager diff --git a/asm/ov00/ov00_0207af9c.inc b/asm/ov00/ov00_0207af9c.inc index c6207636..f4e3b912 100644 --- a/asm/ov00/ov00_0207af9c.inc +++ b/asm/ov00/ov00_0207af9c.inc @@ -231,9 +231,9 @@ .extern func_020435b4 .extern func_02043600 .extern func_02045810 -.extern func_02047024 -.extern func_0204713c -.extern func_0204716c +.extern strcpy +.extern strcat +.extern strcmp .extern func_0204dd9c .extern func_0204f558 .extern func_0204f614 diff --git a/asm/ov00/ov00_0207af9c.s b/asm/ov00/ov00_0207af9c.s index 7964911d..04849b6a 100644 --- a/asm/ov00/ov00_0207af9c.s +++ b/asm/ov00/ov00_0207af9c.s @@ -2933,12 +2933,12 @@ _0207ca54: .global func_ov00_0207ca68 arm_func_start func_ov00_0207ca68 func_ov00_0207ca68: ; 0x0207ca68 - ldr ip, _0207ca74 ; =func_02047024 + ldr ip, _0207ca74 ; =strcpy add r0, r0, #0xc bx ip .align 2, 0 arm_func_end func_ov00_0207ca68 -_0207ca74: .word func_02047024 +_0207ca74: .word strcpy .global func_ov00_0207ca78 arm_func_start func_ov00_0207ca78 @@ -4847,7 +4847,7 @@ _0207e218: add r1, r4, r7 add r0, r8, r0 add r0, r0, r6, lsl #4 - bl func_0204716c + bl strcmp cmp r0, #0 addeq sp, sp, #0x14 moveq r0, r6 @@ -4968,7 +4968,7 @@ _0207e3d0: add r1, r4, r7 add r0, r8, r0 add r0, r0, r6, lsl #4 - bl func_0204716c + bl strcmp cmp r0, #0 addeq sp, sp, #0x14 moveq r0, r6 @@ -44611,7 +44611,7 @@ func_ov00_0209d81c: ; 0x0209d81c _0209d82c: ldr r1, [r5, r4, lsl #2] mov r0, r6 - bl func_0204716c + bl strcmp cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, r5, r6, pc} @@ -54870,14 +54870,14 @@ _020a59dc: b _020a5a08 _020a5a00: mov r0, r4 - bl func_02047024 + bl strcpy _020a5a08: ldr r1, [r5, #8] mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _020a5a28 ; =data_ov00_020e529c mov r0, r4 - bl func_0204713c + bl strcat ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020a59b8 @@ -54892,16 +54892,16 @@ func_ov00_020a5a2c: ; 0x020a5a2c mov r4, r1 ldr r1, [r5, #4] mov r0, r4 - bl func_02047024 + bl strcpy ldr r1, _020a5a6c ; =data_ov00_020e52a4 mov r0, r4 - bl func_0204713c + bl strcat ldr r1, [r5, #8] mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _020a5a70 ; =data_ov00_020e52a8 mov r0, r4 - bl func_0204713c + bl strcat ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020a5a2c @@ -54932,14 +54932,14 @@ _020a5a98: b _020a5ac4 _020a5abc: mov r0, r4 - bl func_02047024 + bl strcpy _020a5ac4: ldr r1, [r5, #8] mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _020a5ae4 ; =data_ov00_020e52b8 mov r0, r4 - bl func_0204713c + bl strcat ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov00_020a5a74 @@ -54955,17 +54955,17 @@ func_ov00_020a5ae8: ; 0x020a5ae8 ldr r1, [r6, #4] mov r0, r5 mov r4, r2 - bl func_02047024 + bl strcpy ldr r1, _020a5b30 ; =data_ov00_020e52f0 mov r0, r5 - bl func_0204713c + bl strcat ldr r1, [r6, #8] mov r0, r5 - bl func_0204713c + bl strcat ldr r1, _020a5b34 ; =data_ov00_020e52e0 mov r0, r5 ldr r1, [r1, r4, lsl #2] - bl func_0204713c + bl strcat ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov00_020a5ae8 diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index 25da2e2f..9bc0cceb 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -386,9 +386,9 @@ .extern func_0203efd8 .extern func_0203f378 .extern func_02042f74 -.extern func_02047024 -.extern func_020470ec -.extern func_0204713c +.extern strcpy +.extern strncpy +.extern strcat .extern func_0204b068 .extern func_0204b0a4 .extern func_0204f558 diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index ab2b5f0a..ce1fd4c0 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -16671,15 +16671,15 @@ _020be594: ldr r1, _020be668 ; =data_ov00_020e6dfc add r0, sp, #4 ldr r1, [r1] - bl func_0204713c + bl strcat ldr r1, _020be66c ; =data_ov00_020dca28 add r0, sp, #4 add r1, r1, r4 - bl func_0204713c + bl strcat ldr r1, _020be668 ; =data_ov00_020e6dfc add r0, sp, #4 ldr r1, [r1, #8] - bl func_0204713c + bl strcat mov r3, #0 ldr r2, _020be670 ; =0x000051b0 add r0, sp, #4 @@ -16793,14 +16793,14 @@ _020be73c: ldr r1, _020be7d4 ; =data_ov00_020e6dfc add r0, sp, #4 ldr r1, [r1, #4] - bl func_0204713c + bl strcat add r0, sp, #4 mov r1, r6 - bl func_0204713c + bl strcat ldr r1, _020be7d4 ; =data_ov00_020e6dfc add r0, sp, #4 ldr r1, [r1, #8] - bl func_0204713c + bl strcat mov r3, #0 ldr r2, _020be7d8 ; =0x000051b0 add r0, sp, #4 @@ -24344,13 +24344,13 @@ func_ov00_020c43c8: ; 0x020c43c8 mov r4, r0 ldr r1, [r1] add r0, sp, #0x48 - bl func_02047024 + bl strcpy ldr r1, [r4, #4] add r0, sp, #0x48 - bl func_0204713c + bl strcat ldr r1, _020c4564 ; =data_ov00_020e8364 add r0, sp, #0x48 - bl func_0204713c + bl strcat mov r0, #0x10 str r0, [sp] mov r0, #1 @@ -24364,10 +24364,10 @@ func_ov00_020c43c8: ; 0x020c43c8 str r0, [r5] ldr r1, [r4] add r0, sp, #0x48 - bl func_02047024 + bl strcpy ldr r1, _020c456c ; =data_ov00_020e836c add r0, sp, #0x48 - bl func_0204713c + bl strcat add r0, sp, #0x48 blx func_02016fe8 cmp r0, #0 @@ -24375,13 +24375,13 @@ func_ov00_020c43c8: ; 0x020c43c8 ldr r1, _020c4560 ; =data_ov00_020e77bc add r0, sp, #8 ldr r1, [r1] - bl func_02047024 + bl strcpy ldr r1, [r4, #4] add r0, sp, #8 - bl func_0204713c + bl strcat ldr r1, _020c4570 ; =data_ov00_020e837c add r0, sp, #8 - bl func_0204713c + bl strcat add r0, r5, #0x14 ldr r1, [r0] ldr r1, [r1, #0xc] @@ -24426,10 +24426,10 @@ _020c4508: _020c4534: ldr r1, [r4] add r0, sp, #0x48 - bl func_02047024 + bl strcpy ldr r1, _020c4584 ; =data_ov00_020e8384 add r0, sp, #0x48 - bl func_0204713c + bl strcat add r0, sp, #0x48 blx func_02016fe8 str r0, [r5, #0xc] @@ -30975,7 +30975,7 @@ _020c99ec: add r0, sp, #0 mov r1, r6 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 @@ -31410,7 +31410,7 @@ _020c9ef4: add r0, sp, #0 mov r1, r6 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r5 bl func_0201e544 @@ -46235,7 +46235,7 @@ _020d54c0: add r0, sp, #0 mov r1, r5 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov03.inc b/asm/ov03.inc index c6e27862..b49da4e4 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -187,9 +187,9 @@ .extern func_02042b40 .extern func_02042f68 .extern func_0204366c -.extern func_02047024 -.extern func_0204713c -.extern func_0204716c +.extern strcpy +.extern strcat +.extern strcmp .extern func_0204f558 .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov03.s b/asm/ov03.s index b75d911e..ba816044 100644 --- a/asm/ov03.s +++ b/asm/ov03.s @@ -3801,7 +3801,7 @@ _020f0b18: add r1, sp, #0 ldr r0, [r0] add r0, r0, #4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _020f0b74 ldr r0, _020f0b84 ; =data_027e0e60 @@ -10257,7 +10257,7 @@ func_ov03_020f4b7c: ; 0x020f4b7c ldmeqia sp!, {r3, pc} add r0, r0, #0x10 add r1, r2, #4 - bl func_0204716c + bl strcmp cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -19916,10 +19916,10 @@ _020fb4fa: bl func_0202ab38 add r1, r0, #0 add r0, sp, #4 - blx func_02047024 + blx strcpy ldr r1, _020fb5bc ; =data_ov03_0210098c add r0, sp, #4 - blx func_0204713c + blx strcat ldr r1, _020fb5c0 ; =data_ov03_021009a8 add r0, r4, #0 add r2, sp, #4 diff --git a/asm/ov04.inc b/asm/ov04.inc index 47123afb..24c42d1b 100644 --- a/asm/ov04.inc +++ b/asm/ov04.inc @@ -351,9 +351,9 @@ .extern func_02043594 .extern func_020435b4 .extern func_02043600 -.extern func_02047008 -.extern func_02047024 -.extern func_0204713c +.extern strlen +.extern strcpy +.extern strcat .extern func_0204dd9c .extern func_0204f558 .extern func_0204f614 diff --git a/asm/ov04.s b/asm/ov04.s index aac77fbf..d05de418 100644 --- a/asm/ov04.s +++ b/asm/ov04.s @@ -10195,7 +10195,7 @@ func_ov04_02105b10: ; 0x02105b10 b _02105c4a _02105b2e: add r0, r4, #0 - blx func_02047008 + blx strlen add r6, r0, #0 mov r0, #0 str r0, [sp, #0x18] @@ -10203,7 +10203,7 @@ _02105b2e: str r0, [sp, #0x10] add r0, sp, #0x1c add r1, r4, #0 - blx func_02047024 + blx strcpy add r0, sp, #0x1c add r4, r0, r6 ldr r0, _02105c50 ; =data_ov04_021104f0 @@ -15333,10 +15333,10 @@ _021081c4: lsl r2, r4, #2 ldr r1, [r1, r2] add r0, sp, #0xc - blx func_0204713c + blx strcat ldr r1, _0210828c ; =data_ov04_02110674 add r0, sp, #0xc - blx func_0204713c + blx strcat mov r0, #0x10 str r0, [sp] mov r0, #0 @@ -16045,10 +16045,10 @@ _02108796: bl func_0202ab38 add r1, r0, #0 add r0, sp, #0x10c - blx func_02047024 + blx strcpy ldr r1, _021088b4 ; =data_ov04_0210f8c0 add r0, sp, #0x10c - blx func_0204713c + blx strcat ldr r1, _021088b8 ; =data_ov04_02110820 add r0, r5, #0 add r2, sp, #0x10c @@ -16161,7 +16161,7 @@ _021088de: _021088e6: ldr r1, _021089d4 ; =data_ov04_0210f8d8 add r0, sp, #0x8c - blx func_02047024 + blx strcpy ldr r1, _021089d8 ; =data_ov04_0211088c add r0, r5, #0 add r2, sp, #0x8c @@ -16197,10 +16197,10 @@ _021088e6: bl func_0202ab38 add r1, r0, #0 add r0, sp, #0x8c - blx func_02047024 + blx strcpy ldr r1, _021089d4 ; =data_ov04_0210f8d8 add r0, sp, #0x8c - blx func_0204713c + blx strcat ldr r1, _021089ec ; =data_ov04_021108c4 add r0, r5, #0 add r2, sp, #0x8c @@ -16230,10 +16230,10 @@ _02108972: bl func_0202ab38 add r1, r0, #0 add r0, sp, #0xc - blx func_02047024 + blx strcpy ldr r1, _021089f8 ; =data_ov04_021108dc add r0, sp, #0xc - blx func_0204713c + blx strcat ldr r1, _021089fc ; =data_ov04_021108f4 add r0, r5, #0 add r2, sp, #0xc @@ -24376,7 +24376,7 @@ _0210c818: _0210c81c: add r0, r5, #0 add r0, #0x50 - blx func_02047024 + blx strcpy add r0, r4, #0 bl func_ov00_020bd718 ldrh r1, [r0, #0xe] diff --git a/asm/ov05.inc b/asm/ov05.inc index f1394115..662816b7 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -295,8 +295,8 @@ .extern func_020385d0 .extern func_0203fab0 .extern func_020435b4 -.extern func_02047024 -.extern func_0204716c +.extern strcpy +.extern strcmp .extern func_0204f614 .extern func_0204f754 .extern func_ov00_02078b40 diff --git a/asm/ov05.s b/asm/ov05.s index 902927d7..d9884364 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -4044,7 +4044,7 @@ func_ov05_02103f8c: ; 0x02103f8c add r0, r0, #0x52 mov r1, r4 add r0, r0, #0x200 - bl func_02047024 + bl strcpy ldmia sp!, {r4, pc} arm_func_end func_ov05_02103f8c @@ -4436,7 +4436,7 @@ func_ov05_021043c0: ; 0x021043c0 ldr r1, [r1] add r0, r0, #0x200 add r1, r1, #4 - bl func_02047024 + bl strcpy _021043f0: str r5, [r4, #0x244] mov r1, #0x14000 @@ -4523,7 +4523,7 @@ _021044e8: ldr r1, [r1] add r0, r0, #0x200 add r1, r1, #4 - bl func_0204716c + bl strcmp cmp r0, #0 addne sp, sp, #8 ldmneia sp!, {r4, pc} diff --git a/asm/ov09.inc b/asm/ov09.inc index 28d6bc50..da1432d8 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -183,8 +183,8 @@ .extern func_02043594 .extern func_020435b4 .extern func_02043600 -.extern func_0204713c -.extern func_0204716c +.extern strcat +.extern strcmp .extern func_0204dd9c .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov09.s b/asm/ov09.s index dac8c644..048d3bbd 100644 --- a/asm/ov09.s +++ b/asm/ov09.s @@ -13664,7 +13664,7 @@ _0211a6cc: blt _0211a734 ldr r0, [sb, r0, lsl #2] mov r1, r7 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0211a734 ldr r1, [sp, #0x20] @@ -13726,7 +13726,7 @@ _0211a788: _0211a7d8: ldr r1, [sb, r4, lsl #2] mov r0, r5 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0211a810 ldr r1, [sp, #0x34] @@ -18861,7 +18861,7 @@ _0211d86e: blx func_ov00_02082614 add r0, r7, #0 add r1, r6, #0 - blx func_0204716c + blx strcmp cmp r0, #0 bne _0211d88a add sp, #0x40 @@ -18912,10 +18912,10 @@ func_ov09_0211d8a0: ; 0x0211d8a0 strb r2, [r0, #3] strb r1, [r0, #4] add r1, r5, #0 - blx func_0204713c + blx strcat ldr r1, _0211d978 ; =data_ov09_0211f4f0 add r0, sp, #0x98 - blx func_0204713c + blx strcat ldr r1, _0211d97c ; =data_ov09_0211f4f8 add r0, sp, #0x58 ldrb r2, [r1] @@ -18929,10 +18929,10 @@ func_ov09_0211d8a0: ; 0x0211d8a0 strb r2, [r0, #3] strb r1, [r0, #4] add r1, r5, #0 - blx func_0204713c + blx strcat ldr r1, _0211d980 ; =data_ov09_0211f500 add r0, sp, #0x58 - blx func_0204713c + blx strcat ldr r1, _0211d984 ; =data_ov09_0211f508 add r0, sp, #0x18 ldrb r2, [r1] @@ -18946,10 +18946,10 @@ func_ov09_0211d8a0: ; 0x0211d8a0 strb r2, [r0, #3] strb r1, [r0, #4] add r1, r5, #0 - blx func_0204713c + blx strcat ldr r1, _0211d988 ; =data_ov09_0211f510 add r0, sp, #0x18 - blx func_0204713c + blx strcat mov r0, #7 str r0, [sp] add r0, sp, #0xc diff --git a/asm/ov11.inc b/asm/ov11.inc index 4a57a2c0..5ba0745c 100644 --- a/asm/ov11.inc +++ b/asm/ov11.inc @@ -188,9 +188,9 @@ .extern func_02043594 .extern func_02043600 .extern func_0204366c -.extern func_02047008 -.extern func_02047024 -.extern func_020470ec +.extern strlen +.extern strcpy +.extern strncpy .extern func_0204902c .extern func_0204afd0 .extern func_ov00_02077af8 diff --git a/asm/ov11.s b/asm/ov11.s index 56fb0437..30752ac9 100644 --- a/asm/ov11.s +++ b/asm/ov11.s @@ -7665,7 +7665,7 @@ _021164fa: _02116510: add r0, sp, #0x48 add r0, #2 - blx func_02047008 + blx strlen add r2, r0, #0 add r0, sp, #0x48 add r0, #2 @@ -7743,7 +7743,7 @@ _0211659c: mov r0, #0 strb r0, [r7, r1] ldr r0, _02116664 ; =data_ov11_0212ee34 - blx func_02047008 + blx strlen add r2, r0, #0 ldr r1, _02116664 ; =data_ov11_0212ee34 add r0, r7, #0 @@ -7781,14 +7781,14 @@ _021165e8: mov r0, #0 strb r0, [r5, r1] add r0, r5, #0 - blx func_02047008 + blx strlen add r6, r0, #0 add r0, r7, #0 - blx func_02047008 + blx strlen cmp r6, r0 bne _0211662a add r0, r7, #0 - blx func_02047008 + blx strlen add r2, r0, #0 add r0, r5, #0 add r1, r7, #0 @@ -8085,7 +8085,7 @@ _0211681a: add r1, r4, #4 str r2, [r0, #0x18] ldr r0, _021168f4 ; =data_ov11_02131cc0 - blx func_02047024 + blx strcpy add r0, r4, #0 add r4, #0x28 ldrb r2, [r4] @@ -9289,7 +9289,7 @@ func_ov11_021170ec: ; 0x021170ec str r0, [sp] ldr r0, _02117254 ; =data_ov11_0213191c ldr r1, _02117258 ; =data_ov11_02131b04 - blx func_02047024 + blx strcpy ldr r1, _0211725c ; =data_ov11_02131b30 ldr r0, [r1] cmp r0, #3 @@ -9336,7 +9336,7 @@ _0211713c: add r0, sp, #0x24 strb r1, [r0] add r0, sp, #4 - blx func_02047008 + blx strlen cmp r0, #0x10 bhi _02117174 cmp r0, #0xa @@ -14461,7 +14461,7 @@ func_ov11_0211989c: ; 0x0211989c ldr r0, _021198d0 ; =data_ov11_02132cf0 add r1, r4, #0 mov r2, #0x3f - blx func_020470ec + blx strncpy ldrb r0, [r4, #5] cmp r0, #0x78 bne _021198b4 @@ -48600,10 +48600,10 @@ func_ov11_02129ba0: ; 0x02129ba0 add r6, r1, #0 add r7, r0, #0 add r5, r2, #0 - blx func_02047008 + blx strlen add r4, r0, #0 add r0, r6, #0 - blx func_02047008 + blx strlen add r1, r0, #0 cmp r4, r5 blt _02129bbe diff --git a/asm/ov12.inc b/asm/ov12.inc index a4b4810a..2ee74985 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -240,7 +240,7 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_0203f904 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov12.s b/asm/ov12.s index d2ded08b..cfe99249 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -4203,7 +4203,7 @@ func_ov12_021162dc: ; 0x021162dc add r0, sp, #4 ldr r1, _021164d8 ; =data_ov12_02135cb4 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #4 bl func_0201e544 @@ -31787,7 +31787,7 @@ _0212c9d8: add r0, sp, #0 mov r2, #0x10 strb r3, [ip] - bl func_020470ec + bl strncpy add r0, sp, #0x10 blx func_02016fe8 add r1, sp, #0 diff --git a/asm/ov13.inc b/asm/ov13.inc index 5dcc25b0..39fa11ec 100644 --- a/asm/ov13.inc +++ b/asm/ov13.inc @@ -70,8 +70,8 @@ .extern func_020400f4 .extern func_02040100 .extern func_02040464 -.extern func_02047024 -.extern func_0204713c +.extern strcpy +.extern strcat .extern func_0204f614 .extern func_0204f754 .extern func_ov00_0207a294 diff --git a/asm/ov13.s b/asm/ov13.s index d92c1c12..46920930 100644 --- a/asm/ov13.s +++ b/asm/ov13.s @@ -2875,10 +2875,10 @@ _02115098: blx func_0202ab38 mov r1, r0 add r0, sp, #0x2c - bl func_02047024 + bl strcpy ldr r1, _02115390 ; =data_ov13_021160bc add r0, sp, #0x2c - bl func_0204713c + bl strcat mov r0, #1 str r0, [sp] ldr r0, _02115394 ; =data_ov13_02116140 @@ -2907,10 +2907,10 @@ _02115098: blx func_0202ab38 mov r1, r0 add r0, sp, #0x2c - bl func_02047024 + bl strcpy ldr r1, _021153a0 ; =data_ov13_021160d4 add r0, sp, #0x2c - bl func_0204713c + bl strcat mov r0, #1 str r0, [sp] ldr r0, _021153a4 ; =data_ov13_02116154 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index 4c96a151..d3f39320 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -141,7 +141,7 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_0204366c -.extern func_0204716c +.extern strcmp .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index ca580f26..45d7371b 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -12422,7 +12422,7 @@ func_ov14_0212991c: ; 0x0212991c _02129960: ldr r0, [r6, r8, lsl #2] mov r1, sl - bl func_0204716c + bl strcmp cmp r0, #0 bne _02129988 cmp sb, r5 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 2d253507..ba394c5a 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -220,8 +220,8 @@ .extern func_0203eb0c .extern func_0203eba8 .extern func_0203ebc8 -.extern func_020470ec -.extern func_0204713c +.extern strncpy +.extern strcat .extern func_0204f558 .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov14/ov14_0213b778.s b/asm/ov14/ov14_0213b778.s index c3ad67a2..bf18ead2 100644 --- a/asm/ov14/ov14_0213b778.s +++ b/asm/ov14/ov14_0213b778.s @@ -13774,23 +13774,23 @@ func_ov14_02145b18: ; 0x02145b18 mov r1, r2 mov r7, r3 strb r5, [sp, #0x10] - bl func_0204713c + bl strcat ldr r1, _02145bc4 ; =data_ov14_021596b8 add r0, sp, #0x10 - bl func_0204713c + bl strcat add r0, sp, #0x10 mov r1, r7 - bl func_0204713c + bl strcat ldr r1, _02145bc8 ; =data_ov14_021596bc add r0, sp, #0x10 - bl func_0204713c + bl strcat add r0, sp, #0x10 blx func_02016fe8 mov r5, r0 mov r1, r7 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov15.inc b/asm/ov15.inc index ed3698f5..390daba1 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -304,8 +304,8 @@ .extern func_02043594 .extern func_020435b4 .extern func_02043600 -.extern func_020470ec -.extern func_0204713c +.extern strncpy +.extern strcat .extern func_0204dd9c .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov15.s b/asm/ov15.s index 0d7dea98..edde9b04 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -22872,7 +22872,7 @@ func_ov15_021329f4: ; 0x021329f4 ldr r1, _02132a74 ; =data_ov15_0218a7f8 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 @@ -24759,7 +24759,7 @@ _021343c0: ldr r1, _021344b4 ; =data_ov15_0218a95c add r0, sp, #0xc mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0xc bl func_0201e544 @@ -73222,7 +73222,7 @@ func_ov15_0215d918: ; 0x0215d918 ldr r1, _0215d9d8 ; =data_ov15_0218ca18 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -84673,20 +84673,20 @@ func_ov15_02167794: ; 0x02167794 strb r6, [ip] strb r3, [ip, #1] strb r2, [sp, #0x18] - bl func_0204713c + bl strcat add r0, sp, #0x18 add r1, sp, #0 - bl func_0204713c + bl strcat ldr r1, _02167894 ; =data_ov15_0218d1b4 add r0, sp, #0x18 - bl func_0204713c + bl strcat add r0, sp, #0x18 blx func_02016fe8 mov r6, r0 add r0, sp, #8 add r1, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #8 bl func_0201e544 @@ -89971,7 +89971,7 @@ func_ov15_0216bfa4: ; 0x0216bfa4 ldr r1, _0216c044 ; =data_ov15_0218d718 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 @@ -91562,7 +91562,7 @@ func_ov15_0216d4ec: ; 0x0216d4ec ldr r1, _0216d60c ; =data_ov15_0218d738 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -92327,7 +92327,7 @@ _0216dfb0: ldr r1, _0216e0bc ; =data_ov15_0218d760 add r0, sp, #4 ldr r1, [r1, #0x20] - bl func_0204713c + bl strcat mov r3, #0 str r3, [sp] ldr r1, [r5, #0x10] @@ -94242,7 +94242,7 @@ func_ov15_0216f8ec: ; 0x0216f8ec ldr r1, _0216f988 ; =data_ov15_0218dab0 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -107186,7 +107186,7 @@ _0217adec: ldr r1, _0217ae50 ; =data_ov15_0218e180 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 @@ -108582,7 +108582,7 @@ func_ov15_0217c0a4: ; 0x0217c0a4 ldr r1, _0217c118 ; =data_ov15_0218e29c add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 @@ -112876,7 +112876,7 @@ func_ov15_0217f9f0: ; 0x0217f9f0 ldr r1, _0217fa70 ; =data_ov15_0218ea20 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 diff --git a/asm/ov19.inc b/asm/ov19.inc index f69f87f8..57aefe81 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -96,7 +96,7 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_02042f74 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov19.s b/asm/ov19.s index b03037c8..5eb279af 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -4290,7 +4290,7 @@ func_ov19_02170eb8: ; 0x02170eb8 ldr r1, _02170f44 ; =data_ov19_02176608 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 @@ -4475,7 +4475,7 @@ func_ov19_02171124: ; 0x02171124 ldr r1, _021711b0 ; =data_ov19_0217662c add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r4 bl func_0201e544 @@ -4663,7 +4663,7 @@ func_ov19_02171330: ; 0x02171330 ldr r1, _0217144c ; =data_ov19_02176650 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -4879,7 +4879,7 @@ func_ov19_02171644: ; 0x02171644 ldr r1, _02171780 ; =data_ov19_02176720 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -9767,7 +9767,7 @@ func_ov19_02175740: ; 0x02175740 mov r4, r0 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov20.inc b/asm/ov20.inc index d37202f3..66418180 100644 --- a/asm/ov20.inc +++ b/asm/ov20.inc @@ -83,7 +83,7 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_02042f68 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov20.s b/asm/ov20.s index fc006fbe..1d53e68b 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -8886,7 +8886,7 @@ func_ov20_02174cfc: ; 0x02174cfc ldr r1, _02174dc4 ; =data_ov20_02178df0 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov22.inc b/asm/ov22.inc index 109c3ae0..a32503bb 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -92,7 +92,7 @@ .extern func_0203e7b4 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov22.s b/asm/ov22.s index 05241526..2f7fc35e 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -4220,7 +4220,7 @@ func_ov22_02170e20: ; 0x02170e20 ldr r1, _02170ef4 ; =data_ov22_021793cc add r0, sp, #4 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #4 bl func_0201e544 @@ -13099,7 +13099,7 @@ func_ov22_0217802c: ; 0x0217802c ldr r1, _0217814c ; =data_ov22_0217a054 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov23.inc b/asm/ov23.inc index dfc4351b..2d7dea74 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -139,7 +139,7 @@ .extern func_0203e7b4 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov23.s b/asm/ov23.s index e167dc7f..94986822 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -2118,7 +2118,7 @@ func_ov23_0216f0f4: ; 0x0216f0f4 ldr r1, _0216f194 ; =data_ov23_0217a214 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov24.inc b/asm/ov24.inc index 7686a3f5..e59e223c 100644 --- a/asm/ov24.inc +++ b/asm/ov24.inc @@ -83,7 +83,7 @@ .extern func_0203e7b4 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov24.s b/asm/ov24.s index 436a6241..85b5ba90 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -10898,7 +10898,7 @@ func_ov24_02176588: ; 0x02176588 ldr r1, _02176688 ; =data_ov24_0217aad4 add r0, sp, #0x10 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0x10 mov r0, r5 bl func_0201e544 @@ -10920,7 +10920,7 @@ _021765f0: ldr r1, _02176698 ; =data_ov24_0217aaf8 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r5 bl func_0201e544 diff --git a/asm/ov25.inc b/asm/ov25.inc index 4f4a1557..dd420a17 100644 --- a/asm/ov25.inc +++ b/asm/ov25.inc @@ -82,7 +82,7 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_02042f68 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov25.s b/asm/ov25.s index 5141be35..35ee93fa 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -4856,7 +4856,7 @@ func_ov25_0217187c: ; 0x0217187c ldr r1, _02171980 ; =data_ov25_02179da8 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0 bl func_0201e544 @@ -4967,7 +4967,7 @@ func_ov25_02171a08: ; 0x02171a08 ldr r1, _02171aa8 ; =data_ov25_02179dc8 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov26.inc b/asm/ov26.inc index c669667f..df7b986b 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -136,8 +136,8 @@ .extern func_0203eba8 .extern func_0203ebc8 .extern func_0203fe60 -.extern func_020470ec -.extern func_0204716c +.extern strncpy +.extern strcmp .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov26.s b/asm/ov26.s index 9baf9ba5..5caab609 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -2590,7 +2590,7 @@ _0216f490: add r0, sp, #0 mov r1, r4 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0 mov r0, r8 bl func_0201e544 @@ -7350,7 +7350,7 @@ func_ov26_021733d0: ; 0x021733d0 ldr r2, [r0] ldr r0, [r1, #0x20] add r1, r2, #4 - bl func_0204716c + bl strcmp cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -13250,7 +13250,7 @@ _0217789c: ldr r1, [r4] mov r0, r6 add r1, r1, #4 - bl func_0204716c + bl strcmp cmp r0, #0 moveq r7, r8 beq _021778d4 diff --git a/asm/ov28.inc b/asm/ov28.inc index 5326dfcf..eae4c86f 100644 --- a/asm/ov28.inc +++ b/asm/ov28.inc @@ -93,9 +93,9 @@ .extern func_0203e7b4 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_02047024 -.extern func_020470ec -.extern func_0204713c +.extern strcpy +.extern strncpy +.extern strcat .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov28.s b/asm/ov28.s index 6aba2edf..b6eff559 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -365,23 +365,23 @@ func_ov28_0216db74: ; 0x0216db74 mov r1, r2 mov r7, r3 strb r5, [sp, #0x10] - bl func_0204713c + bl strcat ldr r1, _0216dc20 ; =data_ov28_02178b30 add r0, sp, #0x10 - bl func_0204713c + bl strcat mov r1, r7 add r0, sp, #0x10 - bl func_0204713c + bl strcat ldr r1, _0216dc24 ; =data_ov28_02178b34 add r0, sp, #0x10 - bl func_0204713c + bl strcat add r0, sp, #0x10 blx func_02016fe8 mov r5, r0 ldr r1, _0216dc28 ; =data_ov28_02178b3c add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -417,23 +417,23 @@ func_ov28_0216dc2c: ; 0x0216dc2c mov r1, r2 mov r7, r3 strb r5, [sp, #0x10] - bl func_0204713c + bl strcat ldr r1, _0216dcdc ; =data_ov28_02178b48 add r0, sp, #0x10 - bl func_0204713c + bl strcat mov r1, r7 add r0, sp, #0x10 - bl func_0204713c + bl strcat ldr r1, _0216dce0 ; =data_ov28_02178b4c add r0, sp, #0x10 - bl func_0204713c + bl strcat add r0, sp, #0x10 blx func_02016fe8 mov r5, r0 ldr r1, _0216dce4 ; =data_ov28_02178b54 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -2086,7 +2086,7 @@ func_ov28_0216f2ec: ; 0x0216f2ec ldr r1, _0216f38c ; =data_ov28_02178920 add r0, sp, #0 ldr r1, [r1, r4, lsl #2] - bl func_02047024 + bl strcpy add r0, r6, #0x2000 bl func_ov00_020c45b0 add r1, sp, #0 @@ -2177,7 +2177,7 @@ func_ov28_0216f410: ; 0x0216f410 ldr r1, _0216f4b0 ; =data_ov28_02178928 add r0, sp, #0 ldr r1, [r1, r4, lsl #2] - bl func_02047024 + bl strcpy add r0, r6, #0x2400 bl func_ov00_020c45b0 add r1, sp, #0 @@ -2267,7 +2267,7 @@ func_ov28_0216f534: ; 0x0216f534 ldr r1, _0216f5d0 ; =data_ov28_02178938 add r0, sp, #0 ldr r1, [r1, r4, lsl #2] - bl func_02047024 + bl strcpy add r0, r6, #0x2840 bl func_ov00_020c45b0 add r1, sp, #0 @@ -2358,7 +2358,7 @@ func_ov28_0216f654: ; 0x0216f654 ldr r1, _0216f6f4 ; =data_ov28_02178944 add r0, sp, #0 ldr r1, [r1, r4, lsl #2] - bl func_02047024 + bl strcpy add r0, r6, #0x2800 bl func_ov00_020c45b0 add r1, sp, #0 @@ -2449,7 +2449,7 @@ func_ov28_0216f778: ; 0x0216f778 ldr r1, _0216f818 ; =data_ov28_02178954 add r0, sp, #0 ldr r1, [r1, r4, lsl #2] - bl func_02047024 + bl strcpy add r0, r6, #0x2800 bl func_ov00_020c45b0 add r1, sp, #0 @@ -10269,23 +10269,23 @@ func_ov28_02175a10: ; 0x02175a10 mov r0, #0 strb r0, [sp, #0x10] add r0, sp, #0x10 - bl func_0204713c + bl strcat ldr r1, _02175ad8 ; =data_ov28_021798e0 add r0, sp, #0x10 - bl func_0204713c + bl strcat add r0, sp, #0x10 mov r1, r4 - bl func_0204713c + bl strcat ldr r1, _02175adc ; =data_ov28_021798e4 add r0, sp, #0x10 - bl func_0204713c + bl strcat add r0, sp, #0x10 blx func_02016fe8 mov r1, r4 mov r4, r0 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 @@ -10321,7 +10321,7 @@ func_ov28_02175ae0: ; 0x02175ae0 ldr r1, _02175b84 ; =data_ov28_021797b8 add r0, sp, #0 ldr r1, [r1, r7, lsl #2] - bl func_02047024 + bl strcpy add r0, r5, #0x3000 bl func_ov00_020c45b0 add r1, sp, #0 diff --git a/asm/ov29.inc b/asm/ov29.inc index a3756255..45ae2b6a 100644 --- a/asm/ov29.inc +++ b/asm/ov29.inc @@ -117,7 +117,7 @@ .extern func_0203e7b4 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_02047024 +.extern strcpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov29.s b/asm/ov29.s index b108c94b..dee62f22 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -390,7 +390,7 @@ func_ov29_0216db20: ; 0x0216db20 bl func_020078f4 add r0, sp, #0 mov r1, r4 - bl func_02047024 + bl strcpy add r1, sp, #0 mov r0, r5 bl func_0201e388 @@ -3172,7 +3172,7 @@ _02170070: bl func_020078f4 ldr r1, [sp] mov r0, r7 - bl func_02047024 + bl strcpy add r0, r4, #0x3400 bl func_ov00_020c45b0 mov r1, r7 @@ -5686,7 +5686,7 @@ func_ov29_02172254: ; 0x02172254 ldr r1, _02172304 ; =data_ov29_02179c3c add r0, sp, #0 ldr r1, [r1, r5, lsl #2] - bl func_02047024 + bl strcpy add r0, r7, #0x3400 bl func_ov00_020c45b0 add r1, sp, #0 @@ -9461,7 +9461,7 @@ func_ov29_02175678: ; 0x02175678 ldr r1, _02175720 ; =data_ov29_02179f20 add r0, sp, #0 ldr r1, [r1, r5, lsl #2] - bl func_02047024 + bl strcpy add r0, r7, #0x3000 bl func_ov00_020c45b0 add r1, sp, #0 @@ -10903,7 +10903,7 @@ func_ov29_021769b8: ; 0x021769b8 ldr r1, _02176a60 ; =data_ov29_0217a0d0 add r0, sp, #0 ldr r1, [r1, r5, lsl #2] - bl func_02047024 + bl strcpy add r0, r7, #0x3000 bl func_ov00_020c45b0 add r1, sp, #0 diff --git a/asm/ov32.inc b/asm/ov32.inc index 7ee17898..4e7d6834 100644 --- a/asm/ov32.inc +++ b/asm/ov32.inc @@ -85,7 +85,7 @@ .extern func_0203e7b4 .extern func_0203eba8 .extern func_0203ebc8 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov32.s b/asm/ov32.s index 652c1f88..02adb416 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -191,7 +191,7 @@ func_ov32_0217bf74: ; 0x0217bf74 ldr r1, _0217c06c ; =data_ov32_02185410 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0 bl func_0201e544 @@ -4157,7 +4157,7 @@ func_ov32_0217f27c: ; 0x0217f27c ldr r1, _0217f374 ; =data_ov32_021859a4 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov33.inc b/asm/ov33.inc index 64ac8c28..75a1b236 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -51,7 +51,7 @@ .extern func_02038b40 .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov33.s b/asm/ov33.s index 2ce9d7d8..2a868610 100644 --- a/asm/ov33.s +++ b/asm/ov33.s @@ -43,7 +43,7 @@ func_ov33_0217bdb0: ; 0x0217bdb0 ldr r1, _0217be80 ; =data_ov33_02180084 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0 bl func_0201e544 @@ -2572,7 +2572,7 @@ func_ov33_0217de2c: ; 0x0217de2c ldr r1, _0217dec0 ; =data_ov33_02180490 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov34.inc b/asm/ov34.inc index 95c809ca..9b7a326f 100644 --- a/asm/ov34.inc +++ b/asm/ov34.inc @@ -60,8 +60,8 @@ .extern func_0202e58c .extern func_0203e784 .extern func_0203e7b4 -.extern func_02047024 -.extern func_020470ec +.extern strcpy +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov34.s b/asm/ov34.s index ef74cba6..83c83798 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -1099,7 +1099,7 @@ _0217cc38: ldr r1, _0217ce08 ; =data_ov34_02185f48 add r0, sp, #0x38 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0x38 mov r0, r6 bl func_0201e544 @@ -1119,7 +1119,7 @@ _0217cc38: ldr r1, _0217ce10 ; =data_ov34_02185f64 add r0, sp, #0x28 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0x28 bl func_0201e544 @@ -1143,7 +1143,7 @@ _0217cce4: ldr r1, _0217ce18 ; =data_ov34_02185f80 add r0, sp, #0x18 mov r2, #0x10 - bl func_020470ec + bl strncpy add r1, sp, #0x18 mov r0, r6 bl func_0201e544 @@ -1163,7 +1163,7 @@ _0217cce4: ldr r1, _0217ce20 ; =data_ov34_02185f9c add r0, sp, #8 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #8 bl func_0201e544 @@ -9065,7 +9065,7 @@ _02183d94: ldr r1, _02183e98 ; =data_ov34_02185ac0 add r0, sp, #0 ldr r1, [r1, r5, lsl #2] - bl func_02047024 + bl strcpy add r0, r7, #0x2c00 bl func_ov00_020c45b0 add r1, sp, #0 diff --git a/asm/ov35.inc b/asm/ov35.inc index 4ee286c4..ea634022 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -91,7 +91,7 @@ .extern func_02036ce4 .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov35.s b/asm/ov35.s index 7a818e32..acad8c80 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -417,7 +417,7 @@ _0217c290: ldr r1, [r1, r5, lsl #2] add r0, sp, #0x38 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0x38 bl func_0201e544 diff --git a/asm/ov36.inc b/asm/ov36.inc index 78e51984..47cd0f54 100644 --- a/asm/ov36.inc +++ b/asm/ov36.inc @@ -84,7 +84,7 @@ .extern func_02036ce4 .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov36.s b/asm/ov36.s index e1af58ce..de1b3d5c 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -104,7 +104,7 @@ func_ov36_0217be30: ; 0x0217be30 ldr r1, _0217bf5c ; =data_ov36_02186eb8 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -787,7 +787,7 @@ func_ov36_0217c704: ; 0x0217c704 ldr r1, _0217c7e0 ; =data_ov36_02186edc add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov37.inc b/asm/ov37.inc index 53efea68..4bf23243 100644 --- a/asm/ov37.inc +++ b/asm/ov37.inc @@ -72,7 +72,7 @@ .extern func_02036140 .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov37.s b/asm/ov37.s index 48a223a6..92cec296 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -4721,7 +4721,7 @@ func_ov37_0217fe68: ; 0x0217fe68 ldr r1, _0217ff3c ; =data_ov37_02188c84 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -11154,7 +11154,7 @@ func_ov37_021857a8: ; 0x021857a8 ldr r1, _02185898 ; =data_ov37_02189144 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov38.inc b/asm/ov38.inc index 10f968db..45d5e3a4 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -95,7 +95,7 @@ .extern func_02036ce4 .extern func_0203e784 .extern func_0203e7b4 -.extern func_02047024 +.extern strcpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov38.s b/asm/ov38.s index 5b09a4a5..d548a14a 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -1770,7 +1770,7 @@ _0217d5e0: ldr r1, _0217d6d4 ; =data_ov38_02188cc0 add r0, sp, #0 ldr r1, [r1, r5, lsl #2] - bl func_02047024 + bl strcpy add r0, r7, #0x1000 bl func_ov00_020c45b0 add r1, sp, #0 diff --git a/asm/ov39.inc b/asm/ov39.inc index d1655ebe..05254637 100644 --- a/asm/ov39.inc +++ b/asm/ov39.inc @@ -84,7 +84,7 @@ .extern func_02038718 .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov39.s b/asm/ov39.s index d3d81c6c..9ae69ffa 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -257,7 +257,7 @@ func_ov39_0217c0b4: ; 0x0217c0b4 ldr r1, _0217c160 ; =data_ov39_02186bcc add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy b _0217c108 _0217c0ec: ldr r0, _0217c164 ; =data_ov39_02186bdc @@ -266,7 +266,7 @@ _0217c0ec: ldr r1, _0217c168 ; =data_ov39_02186bf8 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy _0217c108: add r1, sp, #0 mov r0, r4 diff --git a/asm/ov40.inc b/asm/ov40.inc index 2fbc0d42..ce28dc5a 100644 --- a/asm/ov40.inc +++ b/asm/ov40.inc @@ -190,10 +190,10 @@ .extern func_020435b4 .extern func_02043600 .extern func_0204366c -.extern func_02047024 -.extern func_0204713c -.extern func_0204716c -.extern func_02047280 +.extern strcpy +.extern strcat +.extern strcmp +.extern strncmp .extern func_0204dd9c .extern func_0204f614 .extern func_0204f754 diff --git a/asm/ov40.s b/asm/ov40.s index eb059a95..6d3f7d62 100644 --- a/asm/ov40.s +++ b/asm/ov40.s @@ -3370,7 +3370,7 @@ _0217e934: ldr r2, _0217eaf0 ; =data_ov40_0218875c add r0, r1, #0xc ldr r1, [r2, #0xc] - bl func_0204716c + bl strcmp cmp r0, #0 mov r2, #4 bne _0217e97c @@ -3401,7 +3401,7 @@ _0217e9a8: ldr r2, _0217eaf0 ; =data_ov40_0218875c add r0, r1, #0xc ldr r1, [r2, #4] - bl func_0204716c + bl strcmp ldr r1, _0217eaf4 ; =data_027e0f80 cmp r0, #0 ldr r1, [r1] @@ -3449,7 +3449,7 @@ _0217ea54: add r0, r1, #0xc ldr r1, [r2, #0x10] mov r2, #3 - bl func_02047280 + bl strncmp cmp r0, #0 mov r2, #4 bne _0217eaa0 @@ -4937,7 +4937,7 @@ _0217fc5c: beq _0217fc88 ldr r1, [r0] mov r0, r6 - bl func_0204716c + bl strcmp cmp r0, #0 addeq sp, sp, #8 moveq r0, r4 @@ -4968,7 +4968,7 @@ _0217fccc: beq _0217fcf8 ldr r1, [r0] mov r0, r5 - bl func_0204716c + bl strcmp cmp r0, #0 addeq sp, sp, #8 moveq r0, r6 @@ -7098,7 +7098,7 @@ func_ov40_021816c4: ; 0x021816c4 bl func_020078f4 add r0, sp, #0 mov r1, r4 - bl func_02047024 + bl strcpy ldr r0, [r5, #0xa0] add r1, sp, #0 ldr r2, [r0] @@ -7910,7 +7910,7 @@ func_ov40_02182030: ; 0x02182030 bl func_020078f4 add r0, sp, #0 mov r1, r4 - bl func_02047024 + bl strcpy ldr r0, [r5, #0x78] add r1, sp, #0 ldr r2, [r0] @@ -11181,26 +11181,26 @@ _02184904: ldr r1, _02184988 ; =data_ov40_02189148 mov r0, r4 ldr r1, [r1, r6, lsl #2] - bl func_0204713c + bl strcat ldr r1, _0218498c ; =data_ov40_02189304 mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _02184988 ; =data_ov40_02189148 mov r0, r4 ldr r1, [r1, r6, lsl #2] - bl func_0204713c + bl strcat ldr r1, _02184990 ; =data_ov40_02189308 mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _02184994 ; =data_ov40_02189154 mov r0, #0x28 mla r0, r6, r0, r1 ldr r1, [r0, r5, lsl #2] mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _02184998 ; =data_ov40_0218930c mov r0, r4 - bl func_0204713c + bl strcat ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov40_021848ec @@ -11232,26 +11232,26 @@ _021849b4: ldr r1, _02184a38 ; =data_ov40_02189148 mov r0, r4 ldr r1, [r1, r6, lsl #2] - bl func_0204713c + bl strcat ldr r1, _02184a3c ; =data_ov40_02189328 mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _02184a38 ; =data_ov40_02189148 mov r0, r4 ldr r1, [r1, r6, lsl #2] - bl func_0204713c + bl strcat ldr r1, _02184a40 ; =data_ov40_0218932c mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _02184a44 ; =data_ov40_02189154 mov r0, #0x28 mla r0, r6, r0, r1 ldr r1, [r0, r5, lsl #2] mov r0, r4 - bl func_0204713c + bl strcat ldr r1, _02184a48 ; =data_ov40_02189330 mov r0, r4 - bl func_0204713c + bl strcat ldmia sp!, {r4, r5, r6, pc} .align 2, 0 arm_func_end func_ov40_0218499c @@ -12294,7 +12294,7 @@ func_ov40_02185650: ; 0x02185650 _02185664: mov r0, r6 mov r1, r5 - bl func_0204716c + bl strcmp cmp r0, #0 ldreq r0, _021856b8 ; =data_ov40_0218822c ldreq r0, [r0, r4, lsl #2] @@ -13404,10 +13404,10 @@ func_ov40_0218646c: ; 0x0218646c blx func_0202ab38 mov r1, r0 add r0, sp, #0x20 - bl func_02047024 + bl strcpy ldr r1, _02186600 ; =data_ov40_02189828 add r0, sp, #0x20 - bl func_0204713c + bl strcat mov r0, #1 str r0, [sp] ldr r0, _02186604 ; =data_ov40_02189840 @@ -14830,7 +14830,7 @@ _02187668: blx func_02031fc4 ldr r1, _0218776c ; =data_ov40_021899f0 add r0, sp, #0x1c - bl func_0204713c + bl strcat mov r5, #1 ldr r0, _02187770 ; =data_ov40_02189a08 ldr r2, _02187774 ; =data_020691a0 diff --git a/asm/ov42.inc b/asm/ov42.inc index 0530644c..a8a1e120 100644 --- a/asm/ov42.inc +++ b/asm/ov42.inc @@ -63,8 +63,8 @@ .extern func_020385b8 .extern func_0203e784 .extern func_0203e7b4 -.extern func_02047024 -.extern func_0204713c +.extern strcpy +.extern strcat .extern func_0204f8d4 .extern func_ov00_0207a1c8 .extern func_ov00_0207bb1c diff --git a/asm/ov42.s b/asm/ov42.s index 55be506d..18d17396 100644 --- a/asm/ov42.s +++ b/asm/ov42.s @@ -2654,10 +2654,10 @@ _0218b6ac: blx func_0202ab38 mov r1, r0 add r0, sp, #4 - bl func_02047024 + bl strcpy ldr r1, _0218b7e8 ; =data_ov42_0218ca6c add r0, sp, #4 - bl func_0204713c + bl strcat ldr r1, _0218b7ec ; =data_ov42_0218ca88 mov r0, r4 add r2, sp, #4 @@ -2681,7 +2681,7 @@ _0218b6ac: blx func_ov04_02105cd0 ldr r1, _0218b7f8 ; =data_ov42_0218cab4 add r0, sp, #4 - bl func_0204713c + bl strcat add sp, sp, #0x84 ldmia sp!, {r3, r4, pc} .align 2, 0 diff --git a/asm/ov44.inc b/asm/ov44.inc index 8621521c..21b14abf 100644 --- a/asm/ov44.inc +++ b/asm/ov44.inc @@ -44,7 +44,7 @@ .extern func_0203e784 .extern func_0203e7b4 .extern func_02042f74 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov44.s b/asm/ov44.s index ea91a7ae..c47003b9 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -4168,7 +4168,7 @@ func_ov44_0218c758: ; 0x0218c758 ldr r1, _0218c834 ; =data_ov44_0218fc20 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov48.inc b/asm/ov48.inc index 35e23d6a..b31f38d6 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -43,7 +43,7 @@ .extern func_0202e58c .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov48.s b/asm/ov48.s index 15977de5..2c0bbefc 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -64,7 +64,7 @@ func_ov48_02190070: ; 0x02190070 ldr r1, _02190170 ; =data_ov48_02194d08 add r0, sp, #4 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #4 bl func_0201e544 @@ -5422,7 +5422,7 @@ func_ov48_021942d4: ; 0x021942d4 ldr r1, _0219439c ; =data_ov48_021953a4 add r0, sp, #0x10 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0x10 bl func_0201e544 @@ -5437,7 +5437,7 @@ func_ov48_021942d4: ; 0x021942d4 ldr r1, _021943a4 ; =data_ov48_021953c0 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 @@ -5545,7 +5545,7 @@ func_ov48_02194468: ; 0x02194468 ldr r1, _02194508 ; =data_ov48_021953e0 add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r4 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov49.inc b/asm/ov49.inc index 8fcac83a..47cfea34 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -48,7 +48,7 @@ .extern func_0202e58c .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f754 .extern func_0204f8d4 .extern func_ov00_02079e68 diff --git a/asm/ov49.s b/asm/ov49.s index 74630cfd..e95475c3 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -184,7 +184,7 @@ func_ov49_021956f4: ; 0x021956f4 ldr r1, _021957bc ; =data_ov49_0219872c add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r6 add r1, sp, #0 bl func_0201e544 @@ -243,7 +243,7 @@ func_ov49_021957c0: ; 0x021957c0 ldr r1, _0219588c ; =data_ov49_0219874c add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov51.inc b/asm/ov51.inc index 7bf8858c..9e0ea3fb 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -41,7 +41,7 @@ .extern func_0202bbbc .extern func_0203e784 .extern func_0203e7b4 -.extern func_020470ec +.extern strncpy .extern func_0204f614 .extern func_0204f754 .extern func_0204f8d4 diff --git a/asm/ov51.s b/asm/ov51.s index 922ab59a..af2cf4b2 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -841,7 +841,7 @@ func_ov51_02195f30: ; 0x02195f30 ldr r1, _02196000 ; =data_ov51_0219884c add r0, sp, #0 mov r2, #0x10 - bl func_020470ec + bl strncpy mov r0, r5 add r1, sp, #0 bl func_0201e544 diff --git a/asm/ov52.inc b/asm/ov52.inc index 03ff6756..f2bf2849 100644 --- a/asm/ov52.inc +++ b/asm/ov52.inc @@ -65,7 +65,7 @@ .extern func_02036edc .extern func_0203e784 .extern func_0203e7b4 -.extern func_02047024 +.extern strcpy .extern func_0204f8d4 .extern func_ov00_02079470 .extern func_ov00_02079e68 diff --git a/asm/ov52.s b/asm/ov52.s index cde23989..c6d3d605 100644 --- a/asm/ov52.s +++ b/asm/ov52.s @@ -1661,7 +1661,7 @@ func_ov52_021969d4: ; 0x021969d4 ldr r1, _02196a7c ; =data_ov52_02197a20 add r0, sp, #0 ldr r1, [r1, r5, lsl #2] - bl func_02047024 + bl strcpy add r0, r7, #0x2800 bl func_ov00_020c45b0 add r1, sp, #0 diff --git a/asm/ov61.inc b/asm/ov61.inc index 5d8cab9d..66f661bd 100644 --- a/asm/ov61.inc +++ b/asm/ov61.inc @@ -86,14 +86,14 @@ .extern func_02045b48 .extern func_02045b7c .extern func_02046eb0 -.extern func_02047008 -.extern func_02047024 -.extern func_020470ec -.extern func_0204713c -.extern func_0204716c -.extern func_02047280 -.extern func_020472b4 -.extern func_020472f0 +.extern strlen +.extern strcpy +.extern strncpy +.extern strcat +.extern strcmp +.extern strncmp +.extern strchr +.extern strstr .extern func_02048688 .extern func_02048ecc .extern func_02048f64 diff --git a/asm/ov61.s b/asm/ov61.s index 528e4679..7306a27c 100644 --- a/asm/ov61.s +++ b/asm/ov61.s @@ -628,7 +628,7 @@ func_ov61_0213e580: ; 0x0213e580 mov r1, #0x1000 bl func_0200c910 mov r0, r4 - bl func_02047008 + bl strlen add sp, sp, #0xc ldmia sp!, {r3, r4, pc} .align 2, 0 @@ -645,14 +645,14 @@ func_ov61_0213e5b8: ; 0x0213e5b8 mov r4, r3 mov r0, r5 mov r1, #0 - bl func_020472b4 + bl strchr mov r2, r0 mov r0, r7 mov r1, r6 mov r3, r4 bl func_ov61_0213e580 mov r0, r5 - bl func_02047008 + bl strlen ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end func_ov61_0213e5b8 @@ -667,21 +667,21 @@ func_ov61_0213e5f8: ; 0x0213e5f8 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r2 mov r1, r6 - bl func_020472b4 + bl strchr movs r5, r0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} _0213e628: mov r0, r7 - bl func_02047008 + bl strlen mov r2, r0 mov r1, r7 add r0, r5, #1 - bl func_02047280 + bl strncmp cmp r0, #0 bne _0213e660 mov r0, r7 - bl func_02047008 + bl strlen add r0, r0, r5 ldrsb r0, [r0, #1] cmp r6, r0 @@ -689,13 +689,13 @@ _0213e628: _0213e660: mov r1, r6 add r0, r5, #1 - bl func_020472b4 + bl strchr cmp r0, #0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r1, r6 add r0, r0, #1 - bl func_020472b4 + bl strchr movs r5, r0 bne _0213e628 mvn r0, #0 @@ -703,25 +703,25 @@ _0213e660: _0213e694: mov r1, r6 add r0, r5, #1 - bl func_020472b4 + bl strchr movs r5, r0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r1, r6 add r0, r5, #1 - bl func_020472b4 + bl strchr cmp r0, #0 addne r1, r5, #1 subne r6, r0, r1 bne _0213e6d4 add r0, r5, #1 - bl func_02047008 + bl strlen mov r6, r0 _0213e6d4: mov r0, r4 mov r2, r6 add r1, r5, #1 - bl func_020470ec + bl strncpy mov r1, #0 mov r0, r6 strb r1, [r4, r6] @@ -955,12 +955,12 @@ func_ov61_0213e854: ; 0x0213e854 add r0, r0, #0x400 bl func_ov61_0214a71c mov r0, r4 - bl func_02047008 + bl strlen cmp r0, #0x100 movhs r5, #0xff bhs _0213ea58 mov r0, r4 - bl func_02047008 + bl strlen mov r5, r0 _0213ea58: ldr r1, _0213eacc ; =data_ov61_02181384 @@ -971,12 +971,12 @@ _0213ea58: ldr r1, _0213eacc ; =data_ov61_02181384 mov r2, #0 strb r2, [r1, r5] - bl func_02047008 + bl strlen cmp r0, #0x100 movhs r4, #0xff bhs _0213ea94 ldr r0, [sp, #0x20] - bl func_02047008 + bl strlen mov r4, r0 _0213ea94: ldr r0, [sp, #0x20] @@ -2432,7 +2432,7 @@ func_ov61_0213fc48: ; 0x0213fc48 addne sp, sp, #0xc ldmneia sp!, {r4, r5, r6, r7, pc} ldr r0, _0213fda4 ; =data_ov61_0217a69c - bl func_02047008 + bl strlen mov r2, r0 ldr r1, _0213fda4 ; =data_ov61_0217a69c mov r0, r4 @@ -2441,16 +2441,16 @@ func_ov61_0213fc48: ; 0x0213fc48 addne sp, sp, #0xc ldmneia sp!, {r4, r5, r6, r7, pc} ldr r0, _0213fda4 ; =data_ov61_0217a69c - bl func_02047008 + bl strlen add r4, r4, r0 mov r0, r4 mov r1, #0x76 - bl func_020472b4 + bl strchr sub r7, r0, r4 add r0, sp, #0 mov r1, r4 mov r2, r7 - bl func_020470ec + bl strncpy cmp r7, #0xa addhi sp, sp, #0xc ldmhiia sp!, {r4, r5, r6, r7, pc} @@ -2464,7 +2464,7 @@ func_ov61_0213fc48: ; 0x0213fc48 ldr r0, _0213fda8 ; =data_ov61_0217a6a4 add r1, r7, #1 add r4, r4, r1 - bl func_02047008 + bl strlen mov r2, r0 ldr r1, _0213fda8 ; =data_ov61_0217a6a4 mov r0, r4 @@ -2488,7 +2488,7 @@ func_ov61_0213fc48: ; 0x0213fc48 ldmneia sp!, {r4, r5, r6, r7, pc} _0213fd80: ldr r0, _0213fda8 ; =data_ov61_0217a6a4 - bl func_02047008 + bl strlen mov r2, r0 ldr r1, [r5] mov r0, r6 @@ -3135,12 +3135,12 @@ func_ov61_02140598: ; 0x02140598 add r0, r4, #0x48 mov r5, r2 mov r4, r3 - bl func_02047024 + bl strcpy ldr r0, _02140630 ; =data_ov61_0217ebd4 mov r1, r6 ldr r0, [r0, #4] add r0, r0, #0x148 - bl func_02047024 + bl strcpy ldr r0, _02140630 ; =data_ov61_0217ebd4 ldr r6, [r0, #4] bl func_0200e8f8 @@ -3261,7 +3261,7 @@ _02140748: ldr r1, [r1, #4] add r1, r1, #0x51 add r1, r1, #0x200 - bl func_02047024 + bl strcpy ldr r4, _021407f4 ; =func_ov61_0213e034 ldr r3, _021407f8 ; =func_ov61_0213e068 ldr r1, _021407fc ; =0x00001c14 @@ -3309,13 +3309,13 @@ func_ov61_02140800: ; 0x02140800 ldr r0, [r0, #4] add r1, r1, #0x56 add r0, r0, #0x48 - bl func_02047024 + bl strcpy ldr r0, _021409f0 ; =data_ov61_0217ebd4 add r1, sp, #0x300 ldr r0, [r0, #4] add r1, r1, #0x83 add r0, r0, #0x148 - bl func_02047024 + bl strcpy bl func_ov61_0214de28 ldr r1, _021409f0 ; =data_ov61_0217ebd4 mov r0, #0 @@ -3412,7 +3412,7 @@ _0214096c: ldr r1, [r1, #4] add r1, r1, #0x51 add r1, r1, #0x200 - bl func_02047024 + bl strcpy ldr r2, _02140a00 ; =func_ov61_0213e034 ldr r0, _021409f0 ; =data_ov61_0217ebd4 str r2, [sp, #0x40] @@ -3502,7 +3502,7 @@ _02140ae0: blx func_ov00_02077634 add r1, sp, #0x1d add r0, r4, #0x8e - bl func_0204716c + bl strcmp cmp r0, #0 bne _02140b6c ldr r0, _02140b98 ; =data_ov61_0217ebd4 @@ -3637,7 +3637,7 @@ _02140cb8: beq _02140ccc add r1, sp, #0x10c mov r0, r5 - bl func_02047024 + bl strcpy _02140ccc: ldr r0, [sp, #8] add sp, sp, #0x214 @@ -3925,7 +3925,7 @@ func_ov61_0214106c: ; 0x0214106c mov r5, r0 ldr r0, [r4, #8] ldr r1, _021410c0 ; =data_ov61_0217a6b4 - bl func_0204716c + bl strcmp cmp r0, #0 addne sp, sp, #8 movne r0, #0 @@ -4904,7 +4904,7 @@ _02141ce8: blx func_ov00_02077a30 mov r0, fp add r1, sb, #0x8e - bl func_0204716c + bl strcmp cmp r0, #0 bne _02141e08 ldr r1, [sb, #4] @@ -5024,7 +5024,7 @@ _02141e98: blx func_ov00_02077a30 mov r0, r5 add r1, sl, #0x8e - bl func_0204716c + bl strcmp cmp r0, #0 bne _02141f98 ldr r0, [r4] @@ -5205,7 +5205,7 @@ func_ov61_021420c0: ; 0x021420c0 ldr r0, [r0, r3] cmp r0, #0 beq _02142134 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02142134 mov r0, #0 @@ -5235,7 +5235,7 @@ _02142134: _02142174: mov r0, r6 ldr r8, _021421d8 ; =data_ov61_0217ebfc - bl func_02047008 + bl strlen add r1, r0, #1 mov r0, #4 bl func_ov61_0213e034 @@ -5249,7 +5249,7 @@ _02142174: ldmia sp!, {r4, r5, r6, r7, r8, pc} _021421ac: mov r1, r6 - bl func_02047024 + bl strcpy ldr r1, _021421e8 ; =data_ov61_0217ec00 mov r0, r8 str r5, [r1, r4] @@ -5290,7 +5290,7 @@ func_ov61_021421ec: ; 0x021421ec ldr r0, [r0, r3] cmp r0, #0 beq _02142260 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02142260 mov r0, #0 @@ -5321,7 +5321,7 @@ _02142260: _021422a4: mov r0, r6 ldr r8, _02142308 ; =data_ov61_0217ebfc - bl func_02047008 + bl strlen add r1, r0, #1 mov r0, #4 bl func_ov61_0213e034 @@ -5335,7 +5335,7 @@ _021422a4: ldmia sp!, {r4, r5, r6, r7, r8, pc} _021422dc: mov r1, r6 - bl func_02047024 + bl strcpy ldr r1, _02142318 ; =data_ov61_0217ec00 mov r0, r8 str r5, [r1, r4] @@ -5628,7 +5628,7 @@ _021426d4: bl func_ov61_02144c0c mov r4, r0 ldr r0, _02142870 ; =data_ov61_0217a6fc - bl func_02047008 + bl strlen rsb r1, r4, #0x100 sub r4, r1, r0 mov r1, r4 @@ -8780,7 +8780,7 @@ func_ov61_021452e0: ; 0x021452e0 add r8, r2, r0 beq _02145360 mov r0, r4 - bl func_02047008 + bl strlen mov r6, r0 mov r0, r4 mov r1, r8 @@ -8810,7 +8810,7 @@ func_ov61_02145384: ; 0x02145384 mov r8, r2 mov r0, sb mov r1, #0 - bl func_020472b4 + bl strchr mov r6, r0 cmp r8, #0 mov r7, #0 @@ -8819,7 +8819,7 @@ func_ov61_02145384: ; 0x02145384 _021453b4: mov r0, sb mov r1, r5 - bl func_020472b4 + bl strchr cmp r0, #0 mvneq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -8830,7 +8830,7 @@ _021453b4: _021453dc: mov r0, sb mov r1, #0x2f - bl func_020472b4 + bl strchr cmp r0, #0 moveq r0, r6 cmp sb, r0 @@ -14191,7 +14191,7 @@ _02149d20: mov r0, r7 mov r1, r5 mov r2, fp - bl func_02047280 + bl strncmp cmp r0, #0 ldreq r0, [sp, #0xc] cmpeq r0, #3 @@ -14910,7 +14910,7 @@ func_ov61_0214a644: ; 0x0214a644 ldr r1, _0214a670 ; =data_ov61_0217a834 add r0, r6, #6 mov r2, #2 - bl func_020470ec + bl strncpy strh r5, [r6, #4] str r4, [r6] ldmia sp!, {r4, r5, r6, pc} @@ -16100,7 +16100,7 @@ _0214b4ec: ldrh r2, [r0, #0x7a] add r0, r5, r4 add r1, r5, r1 - bl func_02047280 + bl strncmp cmp r0, #0 moveq r0, #2 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -16288,7 +16288,7 @@ _0214b784: mov r2, sb add r0, r6, #0xc add r1, r4, #4 - bl func_02047280 + bl strncmp cmp r0, #0 ldreqb r0, [r4, #1] ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} @@ -16331,7 +16331,7 @@ _0214b808: mov r1, r6 mov r2, r7 add r0, sl, #0xc - bl func_02047280 + bl strncmp cmp r0, #0 addeq r0, sb, r4, lsl #2 ldreqb r0, [r0, #0x445] @@ -16814,7 +16814,7 @@ _0214be6c: bne _0214bec4 mov r1, r8 add r0, r4, #0xc - bl func_02047280 + bl strncmp cmp r0, #0 bne _0214bec4 cmp r6, #0 @@ -17342,7 +17342,7 @@ func_ov61_0214c49c: ; 0x0214c49c ldr r1, _0214c4e4 ; =data_ov61_0217a230 add r0, r4, #0xc mov r2, #8 - bl func_02047280 + bl strncmp cmp r0, #0 moveq r0, #8 ldmeqia sp!, {r4, pc} @@ -19450,7 +19450,7 @@ func_ov61_0214df8c: ; 0x0214df8c mov r4, r0 ldr r0, [r1] ldr r1, _0214e088 ; =data_ov61_0217a934 - bl func_0204716c + bl strcmp cmp r0, #0 ldrne r0, _0214e084 ; =data_ov61_0217a8d0 movne r1, #1 @@ -19928,7 +19928,7 @@ _0214e624: ldr r5, [r1, #8] add r0, r5, #0xc add r0, r0, #0x1000 - bl func_02047008 + bl strlen add r1, r5, #0xc add r1, r1, #0x1000 ldr r2, [sp] @@ -20051,7 +20051,7 @@ func_ov61_0214e7f0: ; 0x0214e7f0 cmpeq r3, #0 bne _0214e84c ldr r0, _0214e970 ; =data_ov61_0217a9c4 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214e974 ; =data_ov61_0217a9d0 ldr r2, _0214e970 ; =data_ov61_0217a9c4 @@ -20064,7 +20064,7 @@ func_ov61_0214e7f0: ; 0x0214e7f0 ldmia sp!, {r3, r4, r5, r6, pc} _0214e84c: ldr r0, _0214e978 ; =data_ov61_0217a9d8 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214e974 ; =data_ov61_0217a9d0 ldr r2, _0214e978 ; =data_ov61_0217a9d8 @@ -20075,7 +20075,7 @@ _0214e84c: movne r0, #8 ldmneia sp!, {r3, r4, r5, r6, pc} mov r0, r6 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214e97c ; =data_ov61_0217a9e0 mov r0, r4 @@ -20107,7 +20107,7 @@ _0214e8a4: cmp r0, #1 bne _0214e920 ldr r0, _0214e988 ; =data_ov61_0217a9e8 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214e98c ; =data_ov61_0217a9ec ldr r2, _0214e988 ; =data_ov61_0217a9e8 @@ -20393,7 +20393,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 str ip, [sp] bl func_0200c910 add r0, sp, #4 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efb8 ; =data_ov61_0217aa5c mov r0, r6 @@ -20404,7 +20404,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} mov r0, r5 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efbc ; =data_ov61_0217aa64 mov r0, r6 @@ -20415,7 +20415,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0xe - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efc0 ; =data_ov61_0217aa6c mov r0, r6 @@ -20426,7 +20426,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x41 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efc4 ; =data_ov61_0217aa74 mov r0, r6 @@ -20437,7 +20437,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x6f - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efc8 ; =data_ov61_0217aa7c mov r0, r6 @@ -20448,7 +20448,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x15 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efcc ; =data_ov61_0217aa84 mov r0, r6 @@ -20459,7 +20459,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x1a - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efd0 ; =data_ov61_0217aa8c mov r0, r6 @@ -20470,7 +20470,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x1d - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efd4 ; =data_ov61_0217aa94 mov r0, r6 @@ -20481,7 +20481,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x1f - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efd8 ; =data_ov61_0217aa9c mov r0, r6 @@ -20492,7 +20492,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x2c - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efdc ; =data_ov61_0217aaa4 mov r0, r6 @@ -20503,7 +20503,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x2f - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efe0 ; =data_ov61_0217aaac mov r0, r6 @@ -20514,7 +20514,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 movne r0, #0 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x34 - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efe4 ; =data_ov61_0217aab4 mov r0, r6 @@ -20539,7 +20539,7 @@ func_ov61_0214ecb0: ; 0x0214ecb0 cmp r4, #1 bne _0214ef54 add r0, r5, #0x4e - bl func_02047008 + bl strlen mov r3, r0 ldr r1, _0214efec ; =data_ov61_0217aac4 mov r0, r6 @@ -20690,9 +20690,9 @@ func_ov61_0214f118: ; 0x0214f118 add r0, r4, #0x1000 ldr r0, [r0, #0x9f8] ldr r1, _0214f1a4 ; =data_ov61_0217ab70 - bl func_020472f0 + bl strstr add r0, r0, #4 - bl func_02047008 + bl strlen movs r3, r0 beq _0214f190 ldr r2, _0214f1a8 ; =data_ov61_0217ab78 @@ -20888,13 +20888,13 @@ func_ov61_0214f3ac: ; 0x0214f3ac ldr r1, _0214f488 ; =data_ov61_0217ab70 mov r0, r6 add r4, r2, #0x1800 - bl func_020472f0 + bl strstr cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r1, _0214f488 ; =data_ov61_0217ab70 mov r0, r6 - bl func_020472f0 + bl strstr add r1, r5, #0x218 add r6, r0, #4 add r0, r1, #0x1800 @@ -20908,16 +20908,16 @@ func_ov61_0214f3ac: ; 0x0214f3ac bl func_0200e0c8 ldr r0, [r4] ldr r1, _0214f48c ; =data_ov61_0217ab8c - bl func_020472f0 + bl strstr movs r8, r0 moveq r0, #1 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r0, _0214f48c ; =data_ov61_0217ab8c - bl func_02047008 + bl strlen mov r7, r0 ldr r1, _0214f490 ; =data_ov61_0217aba0 add r0, r8, r7 - bl func_020472f0 + bl strstr mov r6, r0 add r0, r5, #0x218 ldrsb r4, [r6] @@ -21008,7 +21008,7 @@ _0214f548: _0214f584: ldr r4, [r0, #0x9f8] mov r0, r4 - bl func_02047008 + bl strlen mov r1, r0 mov r0, r4 bl func_ov61_021554cc @@ -21227,14 +21227,14 @@ func_ov61_0214f864: ; 0x0214f864 add r0, r7, #0x1000 ldrne r6, _0214f920 ; =data_ov61_0217ac28 ldr r0, [r0, #0x124] - bl func_02047008 + bl strlen mov r4, r0 mov r0, r6 - bl func_02047008 + bl strlen add r1, r7, #0x1000 mov r8, r0 ldr r0, [r1, #0x128] - bl func_02047008 + bl strlen sub r1, r8, #4 add r0, r1, r0 add r2, r4, r0 @@ -21276,13 +21276,13 @@ func_ov61_0214f924: ; 0x0214f924 mov r0, r6 mov r7, r1 add r5, r2, #0x1800 - bl func_02047008 + bl strlen mov r4, r0 ldr r0, _0214f9f8 ; =data_ov61_0217ac48 - bl func_02047008 + bl strlen mov sb, r0 mov r0, r7 - bl func_02047008 + bl strlen sub r1, sb, #4 add r0, r1, r0 add r4, r4, r0 @@ -21302,11 +21302,11 @@ func_ov61_0214f924: ; 0x0214f924 _0214f99c: ldr r0, [r5] ldr r1, _0214f9fc ; =data_ov61_0217ab70 - bl func_020472f0 + bl strstr add sb, r0, #2 ldrsb r8, [r0, #2] mov r0, sb - bl func_02047008 + bl strlen add r2, r0, #1 add r0, sb, r4 mov r1, sb @@ -21354,10 +21354,10 @@ func_ov61_0214fa00: ; 0x0214fa00 bl func_ov61_02151810 mov r4, r0 mov r0, r6 - bl func_02047008 + bl strlen mov fp, r0 mov r0, sb - bl func_02047008 + bl strlen sub r1, fp, #2 add r2, r1, r0 ldmib r5, {r0, r1} @@ -21411,7 +21411,7 @@ func_ov61_0214fb0c: ; 0x0214fb0c add r1, r7, #0x1f8 mov r0, r6 add r5, r1, #0x1800 - bl func_02047008 + bl strlen mov r4, r0 ldmib r5, {r0, r1} sub r1, r1, r0 @@ -21558,7 +21558,7 @@ func_ov61_0214fce0: ; 0x0214fce0 mov r5, r0 mov r0, r6 mov r4, #0 - bl func_02047008 + bl strlen cmp r0, #0x100 movhs r0, r4 ldmhsia sp!, {r4, r5, r6, pc} @@ -21566,20 +21566,20 @@ func_ov61_0214fce0: ; 0x0214fce0 mov r1, r6 add r0, r0, #0x1000 mov r2, #0x100 - bl func_020470ec + bl strncpy mov r0, r6 - bl func_02047008 + bl strlen add r1, r5, #0x24 mov r6, r0 add r0, r1, #0x1000 - bl func_02047008 + bl strlen cmp r6, r0 movne r0, r4 ldmneia sp!, {r4, r5, r6, pc} add r0, r5, #0x24 ldr r1, _0214fe24 ; =data_ov61_0217ac9c add r0, r0, #0x1000 - bl func_020472f0 + bl strstr cmp r0, #0 beq _0214fd7c add r0, r5, #0x2b @@ -21596,7 +21596,7 @@ _0214fd7c: add r0, r5, #0x24 ldr r1, _0214fe28 ; =data_ov61_0217aca4 add r0, r0, #0x1000 - bl func_020472f0 + bl strstr cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, r5, r6, pc} @@ -21612,7 +21612,7 @@ _0214fdb8: add r0, r5, #0x1000 ldr r0, [r0, #0x124] ldr r1, _0214fe2c ; =data_ov61_0217acb0 - bl func_020472f0 + bl strstr cmp r0, #0 movne r1, #0 strneb r1, [r0] @@ -21620,7 +21620,7 @@ _0214fdb8: add r0, r5, #0x1000 ldr r0, [r0, #0x124] ldr r1, _0214fe30 ; =data_ov61_0217acb4 - bl func_020472f0 + bl strstr cmp r0, #0 mov r1, #0 addeq r0, r5, #0x1000 @@ -21659,7 +21659,7 @@ func_ov61_0214fe34: ; 0x0214fe34 movgt r0, #0 ldmgtia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r7 - bl func_02047008 + bl strlen mov r1, r0 ldr r0, _0214ff78 ; =data_ov61_0217acb8 add r1, r1, #1 @@ -21673,7 +21673,7 @@ func_ov61_0214fe34: ; 0x0214fe34 cmp r0, #0 beq _0214ff10 mov r0, r6 - bl func_02047008 + bl strlen mov r1, r0 ldr r0, _0214ff7c ; =data_ov61_0217acd8 add r1, r1, #1 @@ -21690,13 +21690,13 @@ func_ov61_0214fe34: ; 0x0214fe34 beq _0214ff10 ldr r0, [r2, r1, lsl #3] mov r1, r7 - bl func_02047024 + bl strcpy ldr r2, [r8] ldr r0, [r8, #8] mov r1, r6 add r0, r2, r0, lsl #3 ldr r0, [r0, #4] - bl func_02047024 + bl strcpy ldr r1, [r8, #8] mov r0, #1 add r1, r1, #1 @@ -21758,20 +21758,20 @@ func_ov61_0214ff88: ; 0x0214ff88 ldr r5, [r0, #0xa08] ldr r1, _02150208 ; =data_ov61_0217ab70 mov r0, r5 - bl func_020472f0 + bl strstr str r0, [sp] cmp r0, #0 addeq sp, sp, #0x10 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} add r0, r0, #4 - bl func_02047008 + bl strlen ldr r1, [sp] add r1, r1, #4 add fp, r1, r0 ldr r1, _0215020c ; =data_ov61_0217ad30 mov r0, r5 - bl func_020472f0 + bl strstr movs r7, r0 addeq sp, sp, #0x10 moveq r0, #0 @@ -21794,7 +21794,7 @@ func_ov61_0214ff88: ; 0x0214ff88 ldr r1, _02150214 ; =data_ov61_0217ad40 add r0, r7, #1 mov r2, #3 - bl func_02047280 + bl strncmp cmp r0, #0 beq _02150074 _02150068: @@ -21804,7 +21804,7 @@ _02150068: _02150074: ldr r1, _02150218 ; =data_ov61_0217aba0 add r0, r7, #5 - bl func_020472f0 + bl strstr cmp r0, #0 addeq sp, sp, #0x10 moveq r0, r5 @@ -21814,7 +21814,7 @@ _02150074: _02150098: ldr r1, _0215021c ; =data_ov61_0217ad44 mov r0, sb - bl func_020472f0 + bl strstr movs r6, r0 beq _0215013c ldrsb r7, [r6] @@ -21823,7 +21823,7 @@ _02150098: strb r1, [r6] ldr r1, _02150218 ; =data_ov61_0217aba0 mov r0, sl - bl func_020472f0 + bl strstr movs r5, r0 streqb r7, [r6] beq _0215013c @@ -21844,7 +21844,7 @@ _02150098: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _02150110: mov r0, sl - bl func_02047008 + bl strlen strb r7, [r6] add r0, sl, r0 strb r8, [r5] @@ -21863,7 +21863,7 @@ _0215013c: _0215014c: ldr r1, _02150220 ; =data_ov61_0217ad48 mov r0, r7 - bl func_020472f0 + bl strstr movs r5, r0 beq _021501fc ldrsb sb, [r5] @@ -21872,12 +21872,12 @@ _0215014c: strb r1, [r5] ldr r1, _02150224 ; =data_ov61_0217ad4c mov r0, r6 - bl func_020472f0 + bl strstr movs sl, r0 bne _02150194 ldr r1, _02150218 ; =data_ov61_0217aba0 mov r0, r6 - bl func_020472f0 + bl strstr mov sl, r0 _02150194: cmp sl, #0 @@ -21899,7 +21899,7 @@ _02150194: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _021501d8: mov r0, r6 - bl func_02047008 + bl strlen add r0, r6, r0 strb sb, [r5] cmp sl, #0 @@ -21936,7 +21936,7 @@ _02150238: cmp r1, #0 beq _02150278 mov r0, r5 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0215026c add r0, r6, r4, lsl #3 @@ -21962,7 +21962,7 @@ func_ov61_02150280: ; 0x02150280 movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} - bl func_02047008 + bl strlen mov r1, r0 mov r0, r4 mov r2, r6 @@ -21988,13 +21988,13 @@ func_ov61_021502d4: ; 0x021502d4 movs r4, r0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} - bl func_02047008 + bl strlen cmp r0, r5 movge r0, #0 ldmgeia sp!, {r4, r5, r6, pc} mov r0, r6 mov r1, r4 - bl func_02047024 + bl strcpy mov r0, #1 ldmia sp!, {r4, r5, r6, pc} arm_func_end func_ov61_021502d4 @@ -22448,7 +22448,7 @@ _021508b0: str r7, [r2, #0x28] ldr r1, _02151548 ; =data_ov61_0217aea8 str r3, [r2, #0x30] - bl func_0204716c + bl strcmp cmp r0, #0 ldrne r0, _02151520 ; =data_ov61_0217f38c movne r1, #1 @@ -22498,7 +22498,7 @@ _0215099c: add r0, r0, #0x1000 ldr r4, [r0, #0x118] mov r0, r4 - bl func_02047008 + bl strlen ldr r1, _02151520 ; =data_ov61_0217f38c mov r3, r0 ldr r0, [r1, #0x14] @@ -22593,7 +22593,7 @@ _02150b00: b _021514cc _02150b24: mov r0, fp - bl func_02047008 + bl strlen add r1, r0, #1 ldr r0, _0215155c ; =data_ov61_0217ae34 blx r6 @@ -22614,11 +22614,11 @@ _02150b24: b _021514cc _02150b74: mov r0, fp - bl func_02047008 + bl strlen mov r2, r0 ldr r0, [sp, #4] mov r1, fp - bl func_020470ec + bl strncpy b _02150ba8 _02150b90: ldr r0, _02151520 ; =data_ov61_0217f38c @@ -22738,7 +22738,7 @@ _02150d00: ldr r2, _02151524 ; =0x00009c40 str r7, [r4, #0x28] str r2, [r4, #0x30] - bl func_0204716c + bl strcmp cmp r0, #0 movne r0, #1 strne r0, [r4, #0x2c] @@ -22783,7 +22783,7 @@ _02150dbc: add r0, r0, #0x1000 ldr r5, [r0, #0x114] mov r0, r5 - bl func_02047008 + bl strlen mov r3, r0 ldr r0, [r4, #0x14] ldr r1, _0215156c ; =data_ov61_0217aef0 @@ -23230,7 +23230,7 @@ _0215142c: b _021514cc _02151450: mov r0, r5 - bl func_02047008 + bl strlen add r1, r0, #1 ldr r0, _02151598 ; =data_ov61_0217ae7c blx r6 @@ -23251,11 +23251,11 @@ _02151450: b _021514cc _021514a0: mov r0, r5 - bl func_02047008 + bl strlen mov r2, r0 ldr r0, [sp] mov r1, r5 - bl func_020470ec + bl strncpy ldr r0, [r4, #0x14] bl func_ov61_0214f7b0 mov r0, fp @@ -23351,10 +23351,10 @@ func_ov61_021515ec: ; 0x021515ec stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x3c mov r6, r0 - bl func_02047008 + bl strlen mov r4, r0 ldr r0, _02151800 ; =data_ov61_0217af9c - bl func_02047008 + bl strlen cmp r4, r0 ldreqsb r0, [r6, #7] cmpeq r0, #0x20 @@ -23388,7 +23388,7 @@ func_ov61_021515ec: ; 0x021515ec beq _021517f4 add r0, sp, #0 mov r1, r6 - bl func_02047024 + bl strcpy mov r2, #0 ldr r1, _02151804 ; =data_02076d88 add r0, sp, #0xc @@ -23415,7 +23415,7 @@ func_ov61_021515ec: ; 0x021515ec _021516ec: ldr r0, [r7, r8, lsl #2] mov r1, r6 - bl func_0204716c + bl strcmp cmp r0, #0 addeq r0, r8, #1 streq r0, [sp, #0x30] @@ -33597,7 +33597,7 @@ _02159ab0: ldr r7, [r5, r4, lsl #2] mov r1, r8 ldr r0, [r7] - bl func_0204716c + bl strcmp cmp r0, #0 moveq r0, r7 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} @@ -33880,7 +33880,7 @@ _02159e58: _02159e64: ldr r7, [sl, r5, lsl #2] mov r0, r7 - bl func_02047008 + bl strlen mov r2, r0 mov r0, r6 mov r1, r7 @@ -34842,7 +34842,7 @@ func_ov61_0215ab60: ; 0x0215ab60 add r0, r4, #0x348 bl func_ov61_0215d8a4 mov r0, r5 - bl func_02047008 + bl strlen mov r2, r0 mov r1, r5 add r0, r4, #0x348 @@ -43406,7 +43406,7 @@ func_ov61_02161ce0: ; 0x02161ce0 mov r5, r0 ldr r1, _02161d74 ; =data_ov61_0217bed0 mov r0, r7 - bl func_020472f0 + bl strstr cmp r0, #0 movne r6, #1 moveq r6, #0 @@ -43872,7 +43872,7 @@ func_ov61_02162270: ; 0x02162270 ldr r1, _021622f8 ; =data_ov61_0217bf18 mov r0, r5 mov r4, r2 - bl func_0204716c + bl strcmp cmp r0, #0 mov r0, r6 bne _021622a0 @@ -44020,7 +44020,7 @@ func_ov61_021623bc: ; 0x021623bc _021623e4: ldr r1, [r4, r5, lsl #2] mov r0, r6 - bl func_0204716c + bl strcmp cmp r0, #0 addeq sp, sp, #8 moveq r0, #0 @@ -44218,7 +44218,7 @@ _02162648: mov r0, r8 add sl, sl, r4 sub sb, sb, r4 - bl func_02047008 + bl strlen add r0, r0, #1 add r7, r7, #1 add r8, r8, r0 @@ -44697,7 +44697,7 @@ _02162c24: ldrb r0, [sb, r6] ldr r7, [r4, r0, lsl #2] mov r0, r7 - bl func_02047008 + bl strlen add r0, r5, r0 add r0, r0, #1 cmp r0, #0x100 @@ -45035,7 +45035,7 @@ func_ov61_02162fe0: ; 0x02162fe0 bl func_ov61_02162204 mov r1, r0 mov r0, r4 - bl func_0204716c + bl strcmp ldr r1, _02163040 ; =data_ov61_0218101c ldr r1, [r1] ldr r1, [r1, #0x49c] @@ -45465,13 +45465,13 @@ _02163508: bl func_ov61_021620c4 mov r1, r6 add r0, r7, #0xc - bl func_02047024 + bl strcpy mov r1, r5 add r0, r7, #0x30 - bl func_02047024 + bl strcpy mov r1, r4 add r0, r7, #0x54 - bl func_02047024 + bl strcpy ldr r1, [sp, #0x20] mov r0, #0 str r1, [r7, #0x488] @@ -45529,22 +45529,22 @@ func_ov61_021635ec: ; 0x021635ec ldr r0, _021636a0 ; =data_ov61_0217bf30 ldr r6, [r0] mov r0, r6 - bl func_02047008 + bl strlen cmp r5, r0 bls _02163678 ldr r0, _021636a0 ; =data_ov61_0217bf30 ldr r5, [r4, #0x7c] ldr r7, [r0] mov r0, r7 - bl func_02047008 + bl strlen mov r2, r0 mov r0, r5 mov r1, r7 - bl func_02047280 + bl strncmp cmp r0, #0 bne _02163678 mov r0, r6 - bl func_02047008 + bl strlen mov r1, r0 mov r0, r4 add r1, r5, r1 @@ -45618,7 +45618,7 @@ func_ov61_02163700: ; 0x02163700 add r0, sp, #8 cmp r1, #0 beq _02163738 - bl func_02047024 + bl strcpy b _02163744 _02163738: ldr r1, _02163824 ; =data_ov61_0217c000 @@ -45697,7 +45697,7 @@ func_ov61_0216382c: ; 0x0216382c mov r4, r0 mov r0, r7 mov r6, r2 - bl func_02047008 + bl strlen add r5, r0, #1 ldr r0, [r4] mov r1, r7 @@ -45910,13 +45910,13 @@ _02163ae4: cmp r6, #0 ldreq r6, _02163d18 ; =data_ov61_0217bfbc mov r0, r7 - bl func_02047008 + bl strlen cmp r0, #0x100 addhi sp, sp, #0x30c movhi r0, #6 ldmhiia sp!, {r4, r5, r6, r7, pc} mov r0, r6 - bl func_02047008 + bl strlen cmp r0, #0x100 addhi sp, sp, #0x30c movhi r0, #6 @@ -46170,7 +46170,7 @@ func_ov61_02163e60: ; 0x02163e60 mov r7, r2 add r0, sb, #0x54 mov r8, r1 - bl func_02047008 + bl strlen mov r5, r0 cmp r7, #0 add r6, sb, #0x54 @@ -46511,7 +46511,7 @@ _021642e4: mov r2, r8 bl func_ov61_0216218c mov r0, r8 - bl func_02047008 + bl strlen add r0, r0, #1 add r8, r8, r0 sub r7, r7, r0 @@ -46541,7 +46541,7 @@ _0216435c: _0216436c: mov r0, r8 mov r4, r8 - bl func_02047008 + bl strlen add r3, r0, #1 add r8, r8, r3 mov r0, sb @@ -46550,7 +46550,7 @@ _0216436c: sub r7, r7, r3 bl func_ov61_0216218c mov r0, r8 - bl func_02047008 + bl strlen add r0, r0, #1 add r8, r8, r0 sub r7, r7, r0 @@ -47867,7 +47867,7 @@ func_ov61_021655ac: ; 0x021655ac mov r4, r0 ldr r0, _02165688 ; =data_ov61_021810c0 mov r1, r4 - bl func_02047024 + bl strcpy ldr r0, _0216568c ; =data_ov61_02181024 mvn r1, #0 str r1, [r0, #4] @@ -47903,7 +47903,7 @@ _021655f4: mov r1, #9 mov r0, r4 strb r1, [r2, #0x10] - bl func_02047008 + bl strlen mov r5, r0 ldr r0, _021656a0 ; =data_ov61_02181039 mov r1, r4 @@ -49216,13 +49216,13 @@ func_ov61_02166654: ; 0x02166654 movs r5, r0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - bl func_02047008 + bl strlen add r0, r0, #1 bl func_ov61_0213e10c movs r4, r0 beq _02166680 mov r1, r5 - bl func_02047024 + bl strcpy _02166680: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} @@ -50820,12 +50820,12 @@ _021679e4: bne _02167a20 add r0, sp, #0x100 add r1, r4, #0x218 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02167a20 add r0, sp, #0 add r1, r4, #0x318 - bl func_0204716c + bl strcmp cmp r0, #0 addeq sp, sp, #0x200 moveq r0, #0 @@ -51186,7 +51186,7 @@ _02167e58: _02167ef8: ldr r0, [sl, #0x1dc] ldr r1, _02168134 ; =data_ov61_0217c490 - bl func_020472f0 + bl strstr movs r5, r0 beq _021680c8 ldr r6, _02168138 ; =data_ov61_0217c4b4 @@ -51242,7 +51242,7 @@ _02167f90: ldr r5, [sl, #0x1ec] mov r1, r6 mov r0, r5 - bl func_020472f0 + bl strstr cmp r0, #0 beq _02168038 add r0, r0, #4 @@ -51281,7 +51281,7 @@ _02168038: ldr r1, _02168148 ; =data_ov61_0217c4e4 mov r0, r5 mov r2, #4 - bl func_02047280 + bl strncmp cmp r0, #0 bne _02168090 mov r1, r5 @@ -51295,7 +51295,7 @@ _02168090: ldr r1, _0216814c ; =data_ov61_0217c4ec mov r0, r5 mov r2, #0xa - bl func_02047280 + bl strncmp cmp r0, #0 beq _021680b4 ldr r1, _02168150 ; =data_ov61_0217c4f4 @@ -51304,7 +51304,7 @@ _02168090: _021680b4: ldr r0, [sl, #0x1dc] ldr r1, _02168134 ; =data_ov61_0217c490 - bl func_020472f0 + bl strstr movs r5, r0 bne _02167f20 _021680c8: @@ -51656,7 +51656,7 @@ _02168540: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _0216858c: add r0, sp, #0x138 - bl func_02047008 + bl strlen add r0, r0, #1 bl func_ov61_0213e10c str r0, [r4, #8] @@ -51671,7 +51671,7 @@ _0216858c: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _021685c4: add r1, sp, #0x138 - bl func_02047024 + bl strcpy stmia r4, {r6, sb} mov r2, #0 str r2, [sp] @@ -51723,7 +51723,7 @@ _02168638: _02168684: ldr r1, _02168d40 ; =data_ov61_0217c6f4 add r0, sp, #0x138 - bl func_020472f0 + bl strstr movs r4, r0 bne _021686c8 ldr r2, _02168d2c ; =data_ov61_0217c6a0 @@ -51742,7 +51742,7 @@ _021686c8: mov r1, #0 add r0, r4, #8 strb r1, [r4] - bl func_02047008 + bl strlen cmp r0, #0x20 beq _02168710 ldr r2, _02168d2c ; =data_ov61_0217c6a0 @@ -52056,7 +52056,7 @@ _02168b28: _02168b74: ldr r1, _02168d5c ; =data_ov61_0217c71c add r0, sp, #0x138 - bl func_020472f0 + bl strstr cmp r0, #0 bne _02168bb8 ldr r2, _02168d2c ; =data_ov61_0217c6a0 @@ -52093,7 +52093,7 @@ _02168bf4: mov r4, r0 ldr r1, _02168d60 ; =data_ov61_0217c720 add r0, sp, #0x138 - bl func_020472f0 + bl strstr movs r1, r0 moveq r0, #0 streqb r0, [sp, #0x38] @@ -52125,7 +52125,7 @@ _02168c70: add r1, sp, #0x38 add r0, r5, #8 str r4, [r5, #4] - bl func_02047024 + bl strcpy mov r2, #0 str r2, [sp] add r1, sp, #0x18 @@ -52640,7 +52640,7 @@ func_ov61_0216936c: ; 0x0216936c mov r6, r0 mov r5, r1 mov r0, r4 - bl func_02047008 + bl strlen mov r3, r0 mov r0, r6 mov r1, r5 @@ -52884,7 +52884,7 @@ func_ov61_021696a4: ; 0x021696a4 mov r6, r0 mov r5, r1 mov r0, r4 - bl func_02047008 + bl strlen mov r3, r0 mov r0, r6 mov r1, r5 @@ -53172,13 +53172,13 @@ func_ov61_02169a7c: ; 0x02169a7c ldmltia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, [r6] mov r1, #0xa - bl func_020472b4 + bl strchr movs r4, r0 beq _02169ba0 ldr r1, _02169bac ; =data_ov61_0217c9d0 sub r0, r4, #5 mov r2, #5 - bl func_02047280 + bl strncmp cmp r0, #0 addne sp, sp, #0x10 movne r0, #3 @@ -54058,7 +54058,7 @@ func_ov61_0216a6a8: ; 0x0216a6a8 addeq r0, r4, #0x77 add r7, r0, #0x100 mov r0, r7 - bl func_02047008 + bl strlen mov r1, r0 mov r0, r7 add r2, r5, #0xa1 @@ -54091,7 +54091,7 @@ _0216a738: str r2, [sp, #0xc] bl func_020459b8 add r0, sp, #0x87 - bl func_02047008 + bl strlen mov r1, r0 add r0, sp, #0x87 add r2, sp, #0x14 @@ -54297,7 +54297,7 @@ func_ov61_0216aa4c: ; 0x0216aa4c mov sb, r1 add r0, r5, #0x77 add r0, r0, #0x100 - bl func_02047008 + bl strlen mov r7, r0 ldr r0, _0216aca4 ; =0x79707367 bl func_ov61_02166dc0 @@ -54395,7 +54395,7 @@ _0216aac0: beq _0216ac78 add r0, sb, #0xc2 add r0, r0, #0x200 - bl func_02047008 + bl strlen mov r6, r0 ldr r0, _0216aca4 ; =0x79707367 bl func_ov61_02166dc0 @@ -54505,7 +54505,7 @@ _0216ad38: _0216ad6c: ldr r1, _0216b354 ; =data_ov61_0217ce38 mov r0, r6 - bl func_020472f0 + bl strstr cmp r0, #0 ldr r1, [r5, #0x418] mov r0, r8 @@ -54543,7 +54543,7 @@ _0216adf4: ldr r1, _0216b358 ; =data_ov61_0217ce40 mov r0, r6 mov r2, #5 - bl func_02047280 + bl strncmp cmp r0, #0 beq _0216ae38 ldr r2, _0216b35c ; =data_ov61_0217ce48 @@ -54601,7 +54601,7 @@ _0216aecc: ldr r1, _0216b364 ; =data_ov61_0217ce78 mov r0, r6 mov r2, #5 - bl func_02047280 + bl strncmp cmp r0, #0 beq _0216af10 ldr r2, _0216b35c ; =data_ov61_0217ce48 @@ -54673,7 +54673,7 @@ _0216afdc: ldr r1, _0216b374 ; =data_ov61_0217ceb0 mov r0, r6 mov r2, #5 - bl func_02047280 + bl strncmp cmp r0, #0 beq _0216b020 ldr r2, _0216b35c ; =data_ov61_0217ce48 @@ -54798,7 +54798,7 @@ _0216b1a0: str r2, [sp, #0xc] bl func_020459b8 add r0, sp, #0xa0 - bl func_02047008 + bl strlen mov r1, r0 add r0, sp, #0xa0 add r2, sp, #0x2d @@ -55472,7 +55472,7 @@ func_ov61_0216bacc: ; 0x0216bacc ldr r1, _0216c254 ; =data_ov61_0217cfa4 mov r0, r4 mov r2, #4 - bl func_02047280 + bl strncmp cmp r0, #0 beq _0216bb44 ldr r2, _0216c258 ; =data_ov61_0217cfac @@ -56659,7 +56659,7 @@ _0216cbd0: ldmia sp!, {r4, r5, r6, pc} _0216cc00: mov r0, r5 - bl func_02047008 + bl strlen cmp r0, #2 beq _0216cc28 ldr r1, _0216d06c ; =data_ov61_0217d210 @@ -57879,7 +57879,7 @@ _0216dc9c: ldmneia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, [r6, #0x18] ldr r1, _0216de04 ; =data_ov61_0217d474 - bl func_020472f0 + bl strstr cmp r0, #0 beq _0216dda0 mov r1, #0 @@ -57888,7 +57888,7 @@ _0216dc9c: ldr r1, _0216de0c ; =data_ov61_0217d480 mov r0, r4 mov r2, #7 - bl func_02047280 + bl strncmp cmp r0, #0 bne _0216dd48 ldr r0, [r6, #0x14] @@ -57914,7 +57914,7 @@ _0216dd48: ldr r1, _0216de14 ; =data_ov61_0217d4ac mov r0, r4 mov r2, #6 - bl func_02047280 + bl strncmp cmp r0, #0 beq _0216dd78 ldr r1, _0216de18 ; =data_ov61_0217d4b4 @@ -58014,7 +58014,7 @@ _0216de5c: _0216deac: ldr r0, [r5, #0x18] ldr r1, _0216e064 ; =data_ov61_0217d474 - bl func_020472f0 + bl strstr cmp r0, #0 beq _0216e048 mov r1, #0 @@ -58023,7 +58023,7 @@ _0216deac: ldr r1, _0216e068 ; =data_ov61_0217d454 mov r0, r7 mov r2, #6 - bl func_02047280 + bl strncmp cmp r0, #0 bne _0216e02c ldr r1, _0216e06c ; =data_ov61_0217d45c @@ -58076,14 +58076,14 @@ _0216df80: add r2, r2, #0x100 bl func_020459b8 add r0, sp, #0x81 - bl func_02047008 + bl strlen mov r1, r0 add r0, sp, #0x81 add r2, sp, #0x10 bl func_ov61_0216659c add r0, sp, #0x31 add r1, sp, #0x10 - bl func_0204716c + bl strcmp cmp r0, #0 beq _0216dffc ldr r2, _0216e07c ; =data_ov61_0217d480 @@ -58886,7 +58886,7 @@ _0216ea4c: bl func_02042f80 _0216ea68: mov r0, r5 - bl func_02047008 + bl strlen mov r4, r0 add r1, sp, #0 mov r3, #0 @@ -59029,7 +59029,7 @@ _0216ec58: cmp r4, r0 bne _0216ec78 mov r0, r5 - bl func_02047008 + bl strlen mov r4, r0 _0216ec78: ldr r1, _0216ed10 ; =data_ov61_0217d648 @@ -59176,7 +59176,7 @@ func_ov61_0216ee0c: ; 0x0216ee0c ldr r1, _0216ef5c ; =data_ov61_0217d66c mov r0, r6 mov r2, #5 - bl func_02047280 + bl strncmp cmp r0, #0 beq _0216ee80 ldr r2, _0216ef60 ; =data_ov61_0217d674 @@ -59380,12 +59380,12 @@ func_ov61_0216f0d4: ; 0x0216f0d4 beq _0216f12c ldr r0, [r5] ldr r1, [r4] - bl func_0204716c + bl strcmp cmp r0, #0 bne _0216f12c ldr r0, [r5, #4] ldr r1, [r4, #8] - bl func_0204716c + bl strcmp cmp r0, #0 bne _0216f12c ldr r1, [r5, #8] @@ -60359,7 +60359,7 @@ _0216fe30: _0216fe9c: ldr r0, [r6, #8] ldr r1, _02170654 ; =data_ov61_0217d9a0 - bl func_020472f0 + bl strstr cmp r0, #0 beq _021711ec mov r0, #0 @@ -60404,7 +60404,7 @@ _0216ff24: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170660 ; =data_ov61_0217d9d4 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0216ffb8 str r5, [sp] @@ -60418,12 +60418,12 @@ _0216ff24: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170664 ; =data_ov61_0217d9dc mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0216ffac ldr r1, _0217063c ; =data_ov61_0217d990 mov r0, r5 - bl func_0204716c + bl strcmp cmp r0, #0 movne r0, #0x600 strne r0, [sp, #0x88] @@ -60434,7 +60434,7 @@ _0216ffac: _0216ffb8: ldr r1, _02170668 ; =data_ov61_0217d9e4 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0217016c ldr r1, [sp, #0x84] @@ -60480,7 +60480,7 @@ _02170040: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170670 ; =data_ov61_0217d9e8 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170090 add r0, sb, #4 @@ -60491,7 +60491,7 @@ _02170040: _02170090: ldr r1, _02170674 ; =data_ov61_0217d9f0 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _021700b8 add r0, sb, #0x23 @@ -60502,7 +60502,7 @@ _02170090: _021700b8: ldr r1, _02170678 ; =data_ov61_0217d9fc mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _021700e0 add r0, sb, #0x38 @@ -60513,7 +60513,7 @@ _021700b8: _021700e0: ldr r1, _0217067c ; =data_ov61_0217da08 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170108 add r0, sb, #0x57 @@ -60524,7 +60524,7 @@ _021700e0: _02170108: ldr r1, _02170680 ; =data_ov61_0217da14 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170130 add r0, sb, #0x76 @@ -60535,12 +60535,12 @@ _02170108: _02170130: ldr r1, _02170668 ; =data_ov61_0217d9e4 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02170158 ldr r1, _02170660 ; =data_ov61_0217d9d4 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170160 _02170158: @@ -60637,7 +60637,7 @@ _02170260: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170688 ; =data_ov61_0217da44 add r0, sp, #0x290 - bl func_0204716c + bl strcmp cmp r0, #0 beq _021702ec ldr r2, _02170684 ; =data_ov61_0217da1c @@ -60712,7 +60712,7 @@ _021703c0: add r0, r8, #4 add r1, r6, #0x5c str r2, [r8] - bl func_02047024 + bl strcpy mov r1, #0 str r1, [r8, #0x38] str r1, [r8, #0x3c] @@ -60729,7 +60729,7 @@ _021703c0: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _0217068c ; =data_ov61_0217da48 add r0, sp, #0x290 - bl func_0204716c + bl strcmp cmp r0, #0 beq _0217044c ldr r2, _02170684 ; =data_ov61_0217da1c @@ -60761,7 +60761,7 @@ _02170460: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r0, r4 mov r1, fp - bl func_0204716c + bl strcmp cmp r0, #0 bne _0217052c ldr r0, [r8, #0x3c] @@ -60806,7 +60806,7 @@ _021704f8: _0217052c: ldr r1, _02170674 ; =data_ov61_0217d9f0 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0217069c ldr r0, [r8, #0x38] @@ -60903,7 +60903,7 @@ _02170698: .word data_ov61_0217da5c _0217069c: ldr r1, _02170690 ; =data_ov61_0217da4c mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 moveq sb, #1 beq _021706e0 @@ -60975,14 +60975,14 @@ _02170788: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170694 ; =data_ov61_0217da54 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 moveq r0, #1 streq r0, [sp, #0x20] beq _02170958 ldr r1, _02170698 ; =data_ov61_0217da5c mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _0217092c ldr r0, [fp, #8] @@ -61030,7 +61030,7 @@ _02170858: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02171210 ; =data_ov61_0217da60 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _021708a8 add r0, r7, #0x28 @@ -61041,7 +61041,7 @@ _02170858: _021708a8: ldr r1, _02170670 ; =data_ov61_0217d9e8 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _021708cc add r0, r7, #4 @@ -61051,7 +61051,7 @@ _021708a8: _021708cc: ldr r1, _02171214 ; =data_ov61_0217da68 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _021708f0 mov r0, r5 @@ -61061,12 +61061,12 @@ _021708cc: _021708f0: ldr r1, _02170698 ; =data_ov61_0217da5c mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02170918 ldr r1, _02170694 ; =data_ov61_0217da54 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170920 _02170918: @@ -61127,7 +61127,7 @@ _02170998: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02171218 ; =data_ov61_0217da74 add r0, sp, #0x290 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02170a24 ldr r2, _02170684 ; =data_ov61_0217da1c @@ -61220,7 +61220,7 @@ _02170af4: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02171220 ; =data_ov61_0217da80 add r0, sp, #0x290 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02170b80 ldr r2, _02170684 ; =data_ov61_0217da1c @@ -61329,7 +61329,7 @@ _02170ca0: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02171224 ; =data_ov61_0217da84 add r0, sp, #0x290 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02170d18 ldr r2, _02170684 ; =data_ov61_0217da1c @@ -61360,14 +61360,14 @@ _02170d28: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02171228 ; =data_ov61_0217da8c mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 moveq r0, #1 streq r0, [sp, #0x24] beq _02170f50 ldr r1, _0217122c ; =data_ov61_0217da94 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170f24 ldr r1, [fp, #4] @@ -61415,7 +61415,7 @@ _02170df8: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170670 ; =data_ov61_0217d9e8 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170e48 add r0, r7, #4 @@ -61426,7 +61426,7 @@ _02170df8: _02170e48: ldr r1, _02170674 ; =data_ov61_0217d9f0 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170e70 add r0, r7, #0x23 @@ -61437,7 +61437,7 @@ _02170e48: _02170e70: ldr r1, _02171230 ; =data_ov61_0217da98 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170e98 add r0, r7, #0x38 @@ -61448,7 +61448,7 @@ _02170e70: _02170e98: ldr r1, _02171234 ; =data_ov61_0217daa0 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170ec0 add r0, r7, #0x57 @@ -61459,7 +61459,7 @@ _02170e98: _02170ec0: ldr r1, _02170680 ; =data_ov61_0217da14 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170ee8 add r0, r7, #0x76 @@ -61470,12 +61470,12 @@ _02170ec0: _02170ee8: ldr r1, _0217122c ; =data_ov61_0217da94 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02170f10 ldr r1, _02171228 ; =data_ov61_0217da8c mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02170f18 _02170f10: @@ -61552,7 +61552,7 @@ _02170fe0: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02171238 ; =data_ov61_0217daa8 add r0, sp, #0x290 - bl func_0204716c + bl strcmp cmp r0, #0 beq _02171058 ldr r2, _02170684 ; =data_ov61_0217da1c @@ -61598,7 +61598,7 @@ _021710a0: ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} ldr r1, _02170670 ; =data_ov61_0217d9e8 mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02171124 mov r0, #0x15 @@ -61624,7 +61624,7 @@ _02171110: _02171124: ldr r1, _0217123c ; =data_ov61_0217daac mov r0, r4 - bl func_0204716c + bl strcmp cmp r0, #0 bne _02171164 ldr r0, [r8, #4] @@ -61910,7 +61910,7 @@ func_ov61_021714c4: ; 0x021714c4 ldr r1, _021715bc ; =data_ov61_0217db24 mov r0, r4 mov r2, #4 - bl func_02047280 + bl strncmp cmp r0, #0 beq _02171538 ldr r2, _021715c0 ; =data_ov61_0217db2c @@ -61991,7 +61991,7 @@ _0217160c: mov r0, r6 mov r1, r5 mov r2, r4 - bl func_020470ec + bl strncpy add r0, r6, r4 mov r1, #0 strb r1, [r0, #-1] @@ -62023,7 +62023,7 @@ func_ov61_02171648: ; 0x02171648 mov r0, r6 mov r2, #7 ldr r4, [r7] - bl func_02047280 + bl strncmp cmp r0, #0 bne _02171704 ldr r1, _02171714 ; =data_ov61_0217dbcc @@ -62049,7 +62049,7 @@ _021716a0: beq _021716f8 ldr r1, _0217171c ; =data_ov61_0217dbe0 mov r0, r6 - bl func_020472f0 + bl strstr cmp r0, #0 movne r0, #1 moveq r0, #0 @@ -62116,12 +62116,12 @@ _021717a0: ldrsb r6, [r8] mov r0, r5 mov r1, r8 - bl func_020472f0 + bl strstr movs r5, r0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} mov r0, r8 - bl func_02047008 + bl strlen add r1, r5, r0 mov r3, #0 sub r0, r7, #1 @@ -62627,19 +62627,19 @@ _02171e40: mov r0, r6 bl func_ov61_02172060 mov r5, r0 - bl func_02047008 + bl strlen mov r4, r0 mov r0, r7 - bl func_02047008 + bl strlen add r0, r4, r0 add r0, r0, #1 bl func_ov61_0213e10c mov r4, r0 mov r1, r5 - bl func_02047024 + bl strcpy mov r0, r4 mov r1, r7 - bl func_0204713c + bl strcat mov r0, r6 mov r1, r4 bl func_ov61_02171fe4 @@ -63034,19 +63034,19 @@ _02172320: ldr r3, [r2, #0x24] eor r3, r3, #1 str r3, [r2, #0x24] - bl func_0204713c + bl strcat ldr r1, _021723d4 ; =data_ov61_0217dd78 add r0, sp, #0 - bl func_0204713c + bl strcat add r1, sp, #0 mov r0, r4 - bl func_020472f0 + bl strstr movs r4, r0 addeq sp, sp, #0x100 moveq r0, #0 ldmeqia sp!, {r4, pc} add r0, sp, #0 - bl func_02047008 + bl strlen ldr r1, _021723d0 ; =data_ov61_02181154 ldr r2, _021723d8 ; =data_ov61_02181184 ldr r1, [r1, #0x24] @@ -63300,7 +63300,7 @@ func_ov61_02172628: ; 0x02172628 mov r6, r0 ldr r1, _02172704 ; =data_ov61_0217ddb0 mov r0, r4 - bl func_020472f0 + bl strstr cmp r0, #0 ldreq r3, _02172708 ; =data_ov61_0217dd74 moveq r6, #0 @@ -63376,7 +63376,7 @@ func_ov61_021727a4: ; 0x021727a4 mov r3, #0 mov r2, #8 strb r3, [r5, r4] - bl func_02047280 + bl strncmp cmp r0, #0 bne _021727dc mov r0, r5 @@ -63387,7 +63387,7 @@ _021727dc: ldr r1, _02172880 ; =data_ov61_0217ddcc mov r0, r5 mov r2, #9 - bl func_02047280 + bl strncmp cmp r0, #0 bne _02172804 mov r0, r5 @@ -63398,7 +63398,7 @@ _02172804: ldr r1, _02172880 ; =data_ov61_0217ddcc mov r0, r5 mov r2, #9 - bl func_02047280 + bl strncmp cmp r0, #0 bne _0217282c mov r0, r5 @@ -63409,7 +63409,7 @@ _0217282c: ldr r1, _02172884 ; =data_ov61_0217ddd8 mov r0, r5 mov r2, #8 - bl func_02047280 + bl strncmp cmp r0, #0 bne _02172854 mov r0, r5 @@ -63420,7 +63420,7 @@ _02172854: ldr r1, _02172888 ; =data_ov61_0217dde4 mov r0, r5 mov r2, #8 - bl func_02047280 + bl strncmp cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -64071,7 +64071,7 @@ func_ov61_02173088: ; 0x02173088 mov r5, r0 ldr r0, _02173188 ; =data_ov61_0217de14 mov r4, r1 - bl func_02047008 + bl strlen mov r7, r0 mov r0, r4 bl func_ov61_02172ed0 @@ -64257,7 +64257,7 @@ func_ov61_021732bc: ; 0x021732bc cmp r4, r0 bne _021732ec mov r0, r5 - bl func_02047008 + bl strlen mov r4, r0 _021732ec: ldmib r6, {r0, r1} @@ -68567,7 +68567,7 @@ func_ov61_02176a54: ; 0x02176a54 moveq r5, r4 beq _02176ba8 mov r1, #0x3a - bl func_020472b4 + bl strchr movs r5, r0 moveq r5, #0 beq _02176b64 @@ -68686,7 +68686,7 @@ _02176c00: cmp r1, r0 ldmneia sp!, {r4, pc} mov r0, r2 - bl func_02047008 + bl strlen add r0, r0, #1 str r0, [r4] ldmia sp!, {r4, pc} @@ -69009,9 +69009,9 @@ func_ov61_02176efc: ; 0x02176efc strb r3, [sp, #0x16] strb r2, [sp, #0x17] strb r2, [sp, #0x18] - bl func_02047024 + bl strcpy ldr r0, _02177138 ; =data_ov61_021810c0 - bl func_02047008 + bl strlen ldrb r1, [r5, #0xe] add r4, r0, #0x16 cmp r1, #0 @@ -69847,10 +69847,10 @@ _02177b6c: bl func_02045b7c mov r1, r7 add r0, r6, #4 - bl func_02047024 + bl strcpy ldr r1, [sp, #0x58] add r0, r6, #0x44 - bl func_02047024 + bl strcpy str r4, [r6, #0xc0] mov r5, #0 str r5, [r6, #0xac] @@ -70253,7 +70253,7 @@ func_ov61_0217807c: ; 0x0217807c mov r6, r1 mov r4, r0 mov r0, r6 - bl func_02047008 + bl strlen ldr r3, [r4, #0x800] add r5, r0, #1 rsb r0, r3, #0x800 @@ -70339,7 +70339,7 @@ _02178198: bne _021781e0 ldr r1, _021781f0 ; =data_ov61_0217e310 mov r0, r7 - bl func_0204716c + bl strcmp cmp r0, #0 beq _021781e0 mov r0, r7 @@ -70578,9 +70578,9 @@ func_ov61_02178488: ; 0x02178488 ldmneia sp!, {r3, r4, r5, r6, pc} add r0, sp, #0 mov r1, r2 - bl func_02047024 + bl strcpy add r0, r6, #0x44 - bl func_02047008 + bl strlen mov r1, r0 add r2, sp, #0 add r0, r6, #0x44 @@ -70593,7 +70593,7 @@ func_ov61_02178488: ; 0x02178488 bl func_ov61_02178250 ldr r0, [r4, #0x800] add r0, r4, r0 - bl func_02047008 + bl strlen ldr r1, [r4, #0x800] add r0, r0, #1 add r0, r1, r0 @@ -72543,16 +72543,16 @@ _02179d74: bl func_ov61_021420c0 mov r1, r4 add r0, sp, #0x30 - bl func_02047024 + bl strcpy ldr r1, _02179ed4 ; =data_ov61_0217e9f4 add r0, sp, #0x30 - bl func_0204713c + bl strcat mov r1, r5 add r0, sp, #0x30 - bl func_0204713c + bl strcat ldr r1, _02179ed8 ; =data_ov61_0217e9f8 add r0, sp, #0x30 - bl func_0204713c + bl strcat ldr r0, [r7, #0xe20] cmp r0, #3 cmpne r0, #1 @@ -72564,7 +72564,7 @@ _02179d74: bl func_020459b8 add r0, sp, #0x30 add r1, sp, #0x10 - bl func_0204713c + bl strcat _02179e98: ldr r0, _02179ee0 ; =func_ov61_02179428 ldr r2, _02179ecc ; =func_ov61_02179544 diff --git a/libs/c/include/string.h b/libs/c/include/string.h new file mode 100644 index 00000000..1483e8e9 --- /dev/null +++ b/libs/c/include/string.h @@ -0,0 +1,13 @@ +#ifndef _C_STRING_H +#define _C_STRING_H + +size_t strlen(const char *str); +char* strcpy(char *dest, const char *src); +char* strncpy(char *dest, const char *src, size_t num); +char* strcat(char *dest, const char *src); +int strcmp(char *str1, char *str2); +int strncmp(char *str1, char *str2, size_t num); +const char* strchr(const char *str, char ch); +const char* strstr(const char *str1, const char *str2); + +#endif