matched sub_080B18DC

This commit is contained in:
Henny022p 2021-02-26 19:14:21 +01:00
parent b29ef1b5d8
commit 7feaa4be7d
3 changed files with 19 additions and 46 deletions

View File

@ -1,43 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080B18DC
sub_080B18DC: @ 0x080B18DC
push {r4, r5, r6, lr}
adds r5, r1, #0
lsls r0, r0, #0x10
lsrs r4, r0, #0x10
movs r6, #0
b _080B18EE
_080B18E8:
adds r0, r6, #1
lsls r0, r0, #0x18
lsrs r6, r0, #0x18
_080B18EE:
cmp r6, #2
bhi _080B1912
adds r0, r4, #0
adds r1, r5, #0
bl sub_080B18A4
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
cmp r2, #0
bne _080B18E8
adds r0, r4, #0
adds r1, r5, #0
bl sub_080B180C
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
cmp r2, #0
bne _080B18E8
_080B1912:
adds r0, r2, #0
pop {r4, r5, r6}
pop {r1}
bx r1
.align 2, 0

View File

@ -900,7 +900,6 @@ SECTIONS {
asm/m4a.o(.text);
asm/libagbsyscall.o(.text);
src/code_080B1520.o(.text);
asm/code_080B1520.o(.text);
*libc.a:memcpy.o(.text);
/* handwritten assembly in arm mode */

View File

@ -5,7 +5,7 @@ typedef struct struct_08DE7D40 {
u16 unk_04;
u16 unk_06;
u8 unk_08;
//u8 filler[3];
// u8 filler[3];
} struct_08DE7D40;
extern struct_08DE7D40* gUnk_02036A50;
@ -222,7 +222,7 @@ u32 sub_080B1864(u16 unk_1, u16* unk_2, u32 unk_3) {
return ret;
}
u32 sub_080B18A4(u16 unk_1, u16* unk_2) {
u16 sub_080B18A4(u16 unk_1, u16* unk_2) {
u16 ret;
if (gUnk_02036A50->unk_00 != 0x200) {
@ -232,3 +232,20 @@ u32 sub_080B18A4(u16 unk_1, u16* unk_2) {
}
return ret;
}
u32 sub_080B18DC(u16 unk_1, u16* unk_2, u32 unk_3) {
u8 i;
u32 ret;
ret = unk_3;
for (i = 0; i < 3; i++) {
ret = sub_080B18A4(unk_1, unk_2);
if (ret == 0) {
ret = sub_080B180C(unk_1, unk_2);
if (ret == 0) {
break;
}
}
}
return ret;
}