falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #581 from nonmatch/patch-59 

Match GetSpriteSubEntryOffsetDataPointer
This commit is contained in:
notyourav 2022-10-21 22:04:35 -07:00 committed by GitHub
parent 73527c63bb 0c832f306d
commit d14dbc826b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
asm/non_matching/coord/GetSpriteSubEntryOffsetDataPointer.inc
View File

@ -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

14
src/physics.c
View File

@ -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,