This commit is contained in:
Donkey Kong 2024-05-24 15:51:47 +09:30
parent ee2a9cfb08
commit 0792ea3c6b
6 changed files with 39 additions and 10 deletions

View File

@ -3261,7 +3261,7 @@ us,asm,func_global_asm_8060AA58,224,no
us,asm,func_global_asm_806DF3D0,124,yes us,asm,func_global_asm_806DF3D0,124,yes
us,asm,func_global_asm_80651BE0,76,yes us,asm,func_global_asm_80651BE0,76,yes
us,asm,func_global_asm_80650684,100,yes us,asm,func_global_asm_80650684,100,yes
us,asm,func_global_asm_8063BEC0,116,no us,asm,func_global_asm_8063BEC0,116,yes
us,asm,func_global_asm_806A5868,1016,yes us,asm,func_global_asm_806A5868,1016,yes
us,asm,func_global_asm_8071D0F0,368,yes us,asm,func_global_asm_8071D0F0,368,yes
us,asm,func_global_asm_806E6368,80,yes us,asm,func_global_asm_806E6368,80,yes

1 version section function length matching
3261 us asm func_global_asm_806DF3D0 124 yes
3262 us asm func_global_asm_80651BE0 76 yes
3263 us asm func_global_asm_80650684 100 yes
3264 us asm func_global_asm_8063BEC0 116 no yes
3265 us asm func_global_asm_806A5868 1016 yes
3266 us asm func_global_asm_8071D0F0 368 yes
3267 us asm func_global_asm_806E6368 80 yes

View File

@ -3261,7 +3261,7 @@ us,asm,func_global_asm_8060AA58,224,no
us,asm,func_global_asm_806DF3D0,124,yes us,asm,func_global_asm_806DF3D0,124,yes
us,asm,func_global_asm_80651BE0,76,yes us,asm,func_global_asm_80651BE0,76,yes
us,asm,func_global_asm_80650684,100,yes us,asm,func_global_asm_80650684,100,yes
us,asm,func_global_asm_8063BEC0,116,no us,asm,func_global_asm_8063BEC0,116,yes
us,asm,func_global_asm_806A5868,1016,yes us,asm,func_global_asm_806A5868,1016,yes
us,asm,func_global_asm_8071D0F0,368,yes us,asm,func_global_asm_8071D0F0,368,yes
us,asm,func_global_asm_806E6368,80,yes us,asm,func_global_asm_806E6368,80,yes

1 version section function length matching
3261 us asm func_global_asm_806DF3D0 124 yes
3262 us asm func_global_asm_80651BE0 76 yes
3263 us asm func_global_asm_80650684 100 yes
3264 us asm func_global_asm_8063BEC0 116 no yes
3265 us asm func_global_asm_806A5868 1016 yes
3266 us asm func_global_asm_8071D0F0 368 yes
3267 us asm func_global_asm_806E6368 80 yes

View File

@ -17,7 +17,7 @@
<text x="38.5" y="14">global_asm</text> <text x="38.5" y="14">global_asm</text>
</g> </g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">41.4376%</text> <text x="111.5" y="15" fill="#010101" fill-opacity=".3">41.4471%</text>
<text x="110.5" y="14">41.4376%</text> <text x="110.5" y="14">41.4471%</text>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -17,7 +17,7 @@
<text x="66.0" y="14">Donkey Kong 64 (US)</text> <text x="66.0" y="14">Donkey Kong 64 (US)</text>
</g> </g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">41.9669%</text> <text x="166.5" y="15" fill="#010101" fill-opacity=".3">41.9740%</text>
<text x="165.5" y="14">41.9669%</text> <text x="165.5" y="14">41.9740%</text>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1743,7 +1743,36 @@ void func_global_asm_8063B4A4(void) {
// big, object model 2 // big, object model 2
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063BBB0.s") #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063BBB0.s")
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063BEC0.s") typedef struct {
s16 unk0;
u8 unk2[0x117 - 0x2];
u8 unk117;
u8 unk118[0x120 - 0x118];
u8 unk120;
u8 unk121[0x250 - 0x121];
u8 unk250; // Index into array at unk254
u8 unk251[0x254 - 0x251];
s32 unk254[1][16]; // TODO: What is this? Matrix array? Substruct array?
} Struct8063BEC0_arg0;
void func_global_asm_8063BEC0(Struct8063BEC0_arg0 *arg0, s32 arg1, s16 arg2, s16 arg3) {
s32 found;
s32 i;
found = FALSE;
for (i = 0; !found && i < arg1;) {
if (arg2 == arg0->unk0) {
found = TRUE;
} else {
i++;
arg0 = arg0->unk254[arg0->unk250];
}
}
if (found) {
arg0->unk117 = arg3;
arg0->unk120 = 1;
}
}
// object model 2 -> 0x48, 0x49, 0x4E, 0x7C -> 0x10, 0x12, 0x38, 0x94, 0x9A // object model 2 -> 0x48, 0x49, 0x4E, 0x7C -> 0x10, 0x12, 0x38, 0x94, 0x9A
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063BF34.s") #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063BF34.s")

View File

@ -758,10 +758,10 @@ void func_global_asm_806A0F78(Actor *arg0, u8 arg1, u8 arg2) {
void func_global_asm_806A1008(u8 arg0, u8 arg1) { void func_global_asm_806A1008(u8 arg0, u8 arg1) {
Actor *temp_a0; Actor *temp_a0;
s16 var_v0; s16 i;
for (var_v0 = 0; var_v0 < D_global_asm_807FBB34; var_v0++) { for (i = 0; i < D_global_asm_807FBB34; i++) {
temp_a0 = D_global_asm_807FB930[var_v0].unk0; temp_a0 = D_global_asm_807FB930[i].unk0;
if (temp_a0->unk58 == ACTOR_ROPE && (temp_a0->unk15F / 3) == arg0) { if (temp_a0->unk58 == ACTOR_ROPE && (temp_a0->unk15F / 3) == arg0) {
temp_a0->control_state = arg1; temp_a0->control_state = arg1;
temp_a0->control_state_progress = 0; temp_a0->control_state_progress = 0;