decomp sub_80416A4

This commit is contained in:
Seth Barberee
2023-11-24 09:53:18 -08:00
parent dbcb324c73
commit a012cdcb4c
2 changed files with 9 additions and 32 deletions

View File

@@ -2771,36 +2771,4 @@ _08041692:
bx r1
thumb_func_end sub_8041550
thumb_func_start sub_80416A4
sub_80416A4:
push {r4,lr}
sub sp, 0x8
lsls r2, 24
lsrs r2, 24
movs r3, 0
ldrsh r4, [r0, r3]
lsls r3, r4, 1
adds r3, r4
lsls r3, 11
movs r4, 0xC0
lsls r4, 4
adds r3, r4
str r3, [sp]
movs r4, 0x2
ldrsh r3, [r0, r4]
lsls r0, r3, 1
adds r0, r3
lsls r0, 11
movs r3, 0x80
lsls r3, 5
adds r0, r3
str r0, [sp, 0x4]
mov r0, sp
bl sub_80416E0
add sp, 0x8
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80416A4
.align 2,0

View File

@@ -71,7 +71,16 @@ extern u8 sub_800E9A8(u32);
extern u32 sub_800E890(unkStruct_80416E0 *);
u32 sub_8041764(unkStruct_80416E0 *param_1, u8 param_2);
s32 sub_80416E0(Position32 *pos, u32 param_2, u8 param_3);
s32 sub_80416A4(Position *pos_1, u32 param_2, u8 param_3)
{
Position32 pos;
pos.x = pos_1->x * 0x1800 + 0xc00;
pos.y = pos_1->y * 0x1800 + 0x1000;
return sub_80416E0(&pos, param_2, param_3);
}
s32 sub_80416E0(Position32 *pos, u32 param_2, u8 param_3)
{