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

Decompile func0002a5e4

This commit is contained in:
Ryan Dwyer 2021-05-16 15:20:42 +10:00
parent 77aa69d1c9
commit 7877388190
2 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/lib/lib_24e40.h
View File

@ -67,7 +67,7 @@ s32 func0002a400(struct coord *pos, s16 *rooms);
s16 func0002a440(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr);
s16 func0002a4d0(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr);
s32 func0002a564(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcol, struct coord *arg4, struct prop **propptr);
u32 func0002a5e4(void);
s32 func0002a5e4(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcol, u16 *arg4, struct coord *arg5);
s32 cdTestVolume(struct coord *pos, f32 width, s16 *rooms, s32 types, s32 arg4, f32 ymax, f32 ymin);
s32 func0002a6fc(struct coord *pos, struct coord *pos2, f32 width, s16 *rooms, s32 types, bool arg5, f32 arg6, f32 arg7);
s32 cdTestAToB1(struct coord *origpos, struct coord *dstpos, f32 width, s16 *dstrooms, s32 types, s32 arg5, f32 ymax, f32 ymin);

69
src/lib/lib_24e40.c
View File

@ -4612,52 +4612,29 @@ s32 func0002a564(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcol, struct
return sp32;
}
GLOBAL_ASM(
glabel func0002a5e4
/* 2a5e4: 27bdffc8 */ addiu $sp,$sp,-56
/* 2a5e8: afbf0024 */ sw $ra,0x24($sp)
/* 2a5ec: afa60040 */ sw $a2,0x40($sp)
/* 2a5f0: afa70044 */ sw $a3,0x44($sp)
/* 2a5f4: 27ae0032 */ addiu $t6,$sp,0x32
/* 2a5f8: 27af002c */ addiu $t7,$sp,0x2c
/* 2a5fc: 24180001 */ addiu $t8,$zero,0x1
/* 2a600: afb8001c */ sw $t8,0x1c($sp)
/* 2a604: afaf0014 */ sw $t7,0x14($sp)
/* 2a608: afae0010 */ sw $t6,0x10($sp)
/* 2a60c: 27a70034 */ addiu $a3,$sp,0x34
/* 2a610: 24060003 */ addiu $a2,$zero,0x3
/* 2a614: 0c009b9f */ jal func00026e7c
/* 2a618: afa00018 */ sw $zero,0x18($sp)
/* 2a61c: 8fb90034 */ lw $t9,0x34($sp)
/* 2a620: c7a4002c */ lwc1 $f4,0x2c($sp)
/* 2a624: 8fa80040 */ lw $t0,0x40($sp)
/* 2a628: 13200004 */ beqz $t9,.L0002a63c
/* 2a62c: 03202025 */ or $a0,$t9,$zero
/* 2a630: e5040000 */ swc1 $f4,0x0($t0)
/* 2a634: 0c00964a */ jal func00025928
/* 2a638: 8fa5004c */ lw $a1,0x4c($sp)
.L0002a63c:
/* 2a63c: 8fa50044 */ lw $a1,0x44($sp)
/* 2a640: 50a00004 */ beqzl $a1,.L0002a654
/* 2a644: 8fa20048 */ lw $v0,0x48($sp)
/* 2a648: 0c0096dc */ jal tileGetFloorCol
/* 2a64c: 8fa40034 */ lw $a0,0x34($sp)
/* 2a650: 8fa20048 */ lw $v0,0x48($sp)
.L0002a654:
/* 2a654: 8fa90034 */ lw $t1,0x34($sp)
/* 2a658: 50400006 */ beqzl $v0,.L0002a674
/* 2a65c: 8fbf0024 */ lw $ra,0x24($sp)
/* 2a660: 51200004 */ beqzl $t1,.L0002a674
/* 2a664: 8fbf0024 */ lw $ra,0x24($sp)
/* 2a668: 952a0002 */ lhu $t2,0x2($t1)
/* 2a66c: a44a0000 */ sh $t2,0x0($v0)
/* 2a670: 8fbf0024 */ lw $ra,0x24($sp)
.L0002a674:
/* 2a674: 87a20032 */ lh $v0,0x32($sp)
/* 2a678: 27bd0038 */ addiu $sp,$sp,0x38
/* 2a67c: 03e00008 */ jr $ra
/* 2a680: 00000000 */ nop
);
s32 func0002a5e4(struct coord *pos, s16 *rooms, f32 *arg2, u16 *floorcol, u16 *flagsptr, struct coord *arg5)
{
struct tile *tile;
s16 sp32;
f32 sp2c;
func00026e7c(pos, rooms, 3, &tile, &sp32, &sp2c, NULL, 1);
if (tile) {
*arg2 = sp2c;
func00025928(tile, arg5);
}
if (floorcol) {
tileGetFloorCol(tile, floorcol);
}
if (flagsptr != NULL && tile != NULL) {
*flagsptr = tile->flags;
}
return sp32;
}
/**
* Tests if a cylinder volume fits in the given position.