Attempt to decompile padGetCentre

This commit is contained in:
Ryan Dwyer
2020-01-26 18:47:12 +10:00
parent cd1559dc98
commit eb5b0e9a11
4 changed files with 28 additions and 8 deletions
+4 -4
View File
@@ -1160,7 +1160,7 @@ glabel func0f00cee4
/* f00d1e8: e7aa00a8 */ swc1 $f10,0xa8($sp)
.L0f00d1ec:
/* f00d1ec: 86040006 */ lh $a0,0x6($s0)
/* f00d1f0: 0fc457cd */ jal func0f115f34
/* f00d1f0: 0fc457cd */ jal padGetCentre
/* f00d1f4: 27a500a0 */ addiu $a1,$sp,0xa0
/* f00d1f8: c7a40124 */ lwc1 $f4,0x124($sp)
/* f00d1fc: c7a80128 */ lwc1 $f8,0x128($sp)
@@ -2292,7 +2292,7 @@ glabel func0f00e1f8
/* f00e1f8: 27bdff68 */ addiu $sp,$sp,-152
/* f00e1fc: afbf0014 */ sw $ra,0x14($sp)
/* f00e200: afa40098 */ sw $a0,0x98($sp)
/* f00e204: 0fc457cd */ jal func0f115f34
/* f00e204: 0fc457cd */ jal padGetCentre
/* f00e208: 27a50088 */ addiu $a1,$sp,0x88
/* f00e20c: 8fa40098 */ lw $a0,0x98($sp)
/* f00e210: 24050028 */ addiu $a1,$zero,0x28
@@ -2342,7 +2342,7 @@ glabel func0f00e2b0
/* f00e2b0: 27bdff68 */ addiu $sp,$sp,-152
/* f00e2b4: afbf0014 */ sw $ra,0x14($sp)
/* f00e2b8: afa40098 */ sw $a0,0x98($sp)
/* f00e2bc: 0fc457cd */ jal func0f115f34
/* f00e2bc: 0fc457cd */ jal padGetCentre
/* f00e2c0: 27a50088 */ addiu $a1,$sp,0x88
/* f00e2c4: 8fa40098 */ lw $a0,0x98($sp)
/* f00e2c8: 24050030 */ addiu $a1,$zero,0x30
@@ -2564,7 +2564,7 @@ glabel func0f00e368
/* f00e608: 0c00567f */ jal func000159fc
/* f00e60c: 27a500ac */ addiu $a1,$sp,0xac
/* f00e610: 86040006 */ lh $a0,0x6($s0)
/* f00e614: 0fc457cd */ jal func0f115f34
/* f00e614: 0fc457cd */ jal padGetCentre
/* f00e618: 27a500a0 */ addiu $a1,$sp,0xa0
/* f00e61c: 8fa20044 */ lw $v0,0x44($sp)
/* f00e620: c7a801a4 */ lwc1 $f8,0x1a4($sp)
+1 -1
View File
@@ -21188,7 +21188,7 @@ glabel func0f077c10
/* f077d50: 27a50270 */ addiu $a1,$sp,0x270
/* f077d54: 0018c840 */ sll $t9,$t8,0x1
/* f077d58: 02194021 */ addu $t0,$s0,$t9
/* f077d5c: 0fc457cd */ jal func0f115f34
/* f077d5c: 0fc457cd */ jal padGetCentre
/* f077d60: 8504005c */ lh $a0,0x5c($t0)
/* f077d64: 82090085 */ lb $t1,0x85($s0)
/* f077d68: 24050002 */ addiu $a1,$zero,0x2
+21 -1
View File
@@ -841,7 +841,7 @@ bool padHasBboxData(s32 padnum)
}
GLOBAL_ASM(
glabel func0f115f34
glabel padGetCentre
/* f115f34: 27bdff90 */ addiu $sp,$sp,-112
/* f115f38: afbf0014 */ sw $ra,0x14($sp)
/* f115f3c: 00a03825 */ or $a3,$a1,$zero
@@ -921,6 +921,26 @@ glabel func0f115f34
/* f116064: 00000000 */ sll $zero,$zero,0x0
);
//void padGetCentre(s32 padnum, struct coord *coord)
//{
// struct pad pad;
//
// padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad);
//
// coord->x = pad.pos.x + (
// (pad.bbox.xmin + pad.bbox.xmax) * pad.normal.x +
// (pad.bbox.ymin + pad.bbox.ymax) * pad.up.x +
// pad.look.x * (pad.bbox.zmin + pad.bbox.zmax)) * 0.5f;
// coord->y = (
// (pad.bbox.xmax + pad.bbox.xmin) * pad.normal.y +
// (pad.bbox.ymin + pad.bbox.ymax) * pad.up.y +
// pad.look.y * (pad.bbox.zmin + pad.bbox.zmax)) * 0.5f + pad.pos.y;
// coord->z = (
// (pad.bbox.xmin + pad.bbox.xmax) * pad.normal.z +
// (pad.bbox.ymin + pad.bbox.ymax) * pad.up.z +
// pad.look.z * (pad.bbox.zmin + pad.bbox.zmax)) * 0.5f + pad.pos.z;
//}
GLOBAL_ASM(
glabel func0f116068
/* f116068: 3c0e800a */ lui $t6,0x800a
+2 -2
View File
@@ -3,8 +3,9 @@
#include <ultra64.h>
#include "types.h"
void padUnpack(s32 padnum, u32 fields, struct pad *pad);
bool padHasBboxData(s32 padnum);
u32 func0f115f34(void);
void padGetCentre(s32 padnum, struct coord *coord);
u32 func0f116068(void);
u32 func0f116190(void);
u32 func0f116240(void);
@@ -147,6 +148,5 @@ u32 func0f11e78c(void);
u32 func0f11e7f0(void);
u32 func0f11e844(void);
u32 func0f11ea34(void);
void padUnpack(s32 padnum, u32 fields, struct pad *pad);
#endif