izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

c: func_8000E9D0

Browse Source
This commit is contained in:
Mittenz
2020-08-24 15:51:03 -05:00
parent 4595ff8ae4
commit 31eb801351
2 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_00BC20/func_8000E9D0.s
-35
View File
@@ -1,35 +0,0 @@
glabel func_8000E9D0
/* 00F5D0 8000E9D0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 00F5D4 8000E9D4 AFBF0014 */ sw $ra, 0x14($sp)
/* 00F5D8 8000E9D8 848E0006 */ lh $t6, 6($a0)
/* 00F5DC 8000E9DC 00802825 */ move $a1, $a0
/* 00F5E0 8000E9E0 35CF8000 */ ori $t7, $t6, 0x8000
/* 00F5E4 8000E9E4 A48F0006 */ sh $t7, 6($a0)
/* 00F5E8 8000E9E8 8484002C */ lh $a0, 0x2c($a0)
/* 00F5EC 8000E9EC AFA50018 */ sw $a1, 0x18($sp)
/* 00F5F0 8000E9F0 3498C000 */ ori $t8, $a0, 0xc000
/* 00F5F4 8000E9F4 0018CC00 */ sll $t9, $t8, 0x10
/* 00F5F8 8000E9F8 0C00916D */ jal func_800245B4
/* 00F5FC 8000E9FC 00192403 */ sra $a0, $t9, 0x10
/* 00F600 8000EA00 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 00F604 8000EA04 2442AE5C */ addiu $v0, %lo(objCount) # addiu $v0, $v0, -0x51a4
/* 00F608 8000EA08 8C4A0000 */ lw $t2, ($v0)
/* 00F60C 8000EA0C 3C098012 */ lui $t1, %hi(objPtrList) # $t1, 0x8012
/* 00F610 8000EA10 8D29AE58 */ lw $t1, %lo(objPtrList)($t1)
/* 00F614 8000EA14 8FA50018 */ lw $a1, 0x18($sp)
/* 00F618 8000EA18 000A5880 */ sll $t3, $t2, 2
/* 00F61C 8000EA1C 012B6021 */ addu $t4, $t1, $t3
/* 00F620 8000EA20 AD850000 */ sw $a1, ($t4)
/* 00F624 8000EA24 8C4D0000 */ lw $t5, ($v0)
/* 00F628 8000EA28 00000000 */ nop
/* 00F62C 8000EA2C 25AE0001 */ addiu $t6, $t5, 1
/* 00F630 8000EA30 AC4E0000 */ sw $t6, ($v0)
/* 00F634 8000EA34 3C028012 */ lui $v0, %hi(D_8011AE64) # $v0, 0x8012
/* 00F638 8000EA38 2442AE64 */ addiu $v0, %lo(D_8011AE64) # addiu $v0, $v0, -0x519c
/* 00F63C 8000EA3C 8C4F0000 */ lw $t7, ($v0)
/* 00F640 8000EA40 8FBF0014 */ lw $ra, 0x14($sp)
/* 00F644 8000EA44 25F80001 */ addiu $t8, $t7, 1
/* 00F648 8000EA48 AC580000 */ sw $t8, ($v0)
/* 00F64C 8000EA4C 03E00008 */ jr $ra
/* 00F650 8000EA50 27BD0018 */ addiu $sp, $sp, 0x18
src/unknown_00BC20.c
+47 -5
View File
@@ -6,6 +6,7 @@
#include "structs.h"
#include "fast3d.h"
extern s32 D_800DC700;
extern s16 D_800DC708;
extern s32 D_800DC718;
@@ -162,6 +163,9 @@ void *func_80070C9C(s32, u32);
s32 *func_80076C58(s32);
void func_8001D258(f32, f32, s32, s32, s32);
extern void func_800245B4(s16);
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B020.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B290.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B38C.s")
@@ -486,7 +490,13 @@ s32 func_8000E9C0(void) {
return D_8011AE64;
}
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E9D0.s")
void func_8000E9D0(Player* arg0){
arg0->unk6 |= 0x8000;
func_800245B4(arg0->unk2C | 0xC000);
objPtrList[objCount++] = arg0;
if(1);
D_8011AE64++;
}
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000EA54.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000F648.s")
@@ -1115,10 +1125,11 @@ void func_8001E36C(s32 arg0, f32* arg1, f32* arg2, f32* arg3){
*arg3 = -32000.0f;
for(i=0; i<objCount; i++){
current_obj = objPtrList[i];
if( current_obj != NULL
&& (current_obj->unk6 & 0x8000) == 0
&& current_obj->unk48 == 39
&& current_obj->unk78 == arg0
&& (current_obj->unk6 & 0x8000) == 0
&& current_obj->unk48 == 39
&& current_obj->unk78 == arg0
){
*arg1 = current_obj->x_position;
*arg2 = current_obj->y_position;
@@ -1245,8 +1256,39 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800230D0.s")
s8 func_8002341C(void) {
return D_8011AEF6;
}
#if 1
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8002342C.s")
#else
extern f32 sqrtf(f32);
//bad regalloc
//finds furthest object (with some additional conditions)
Player* func_8002342C(f32 x, f32 z){
Player* retval = NULL;
s32 i;
Player* currObj = NULL;
f32 x;
f32 z;
f32 dist;
f32 max = 0.0f;
for(i=0; i<objCount; i++){
currObj = objPtrList[i];
if((currObj->unk6 & 0x8000) == 0 && currObj->unk48 == 87){
x = currObj->x_position - x;
z = currObj->z_position - z;
dist = sqrtf(x*x + z*z);
if(max < dist){
max = dist;
retval = currObj;
}
}
}
return retval;
}
#endif
s32 func_80023568(void) {
if (D_8011AD3C != 0) {