diff --git a/asm/non_matching/coord/GetSpriteSubEntryOffsetDataPointer.inc b/asm/non_matching/coord/GetSpriteSubEntryOffsetDataPointer.inc deleted file mode 100644 index 7cbf62d6..00000000 --- a/asm/non_matching/coord/GetSpriteSubEntryOffsetDataPointer.inc +++ /dev/null @@ -1,17 +0,0 @@ - .syntax unified - lsls r0, r0, #1 - ldr r2, _080700E4 @ =gUnk_089FB780 - adds r0, r0, r2 - ldrh r0, [r0] - subs r2, #0x10 - adds r0, r0, r2 - adds r1, r0, r1 - ldrb r0, [r1] - lsls r0, r0, #2 - adds r0, r0, r2 - ldr r1, [r2] - adds r0, r1, r0 - bx lr - .align 2, 0 -_080700E4: .4byte gExtraFrameOffsets+0x10 - .syntax divided diff --git a/src/physics.c b/src/physics.c index 16763375..023af557 100644 --- a/src/physics.c +++ b/src/physics.c @@ -668,18 +668,16 @@ static bool32 sub_0807007C(struct_gUnk_020000C0* this, u32 param_2) { return 1; } -NONMATCH("asm/non_matching/coord/GetSpriteSubEntryOffsetDataPointer.inc", - u8* GetSpriteSubEntryOffsetDataPointer(u32 param_1, u32 param_2)) { - u8* rv; +u8* GetSpriteSubEntryOffsetDataPointer(u32 param_1, u32 param_2) { u32 val; u32 val2; val = ((u16*)(((u8*)gExtraFrameOffsets) + 0x10))[param_1]; - val2 = ((u8*)gExtraFrameOffsets)[val + param_2] * 4; - rv = val2 + ((u8*)gExtraFrameOffsets); - rv = rv + *((u32*)((u8*)gExtraFrameOffsets)); - return rv; + val += (u32)gExtraFrameOffsets; + val2 = *(u8*)(val + param_2) * 4; + val2 += (u32)gExtraFrameOffsets; + val = *((u32*)gExtraFrameOffsets) + val2; + return (u8*)val; } -END_NONMATCH const u8 gUnk_08114F38[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0,