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

Renamed 4 functions in unknown_00BC20

Browse Source
This commit is contained in:
David Benepe
2021-06-24 13:34:20 -05:00
parent 9be3a62ed8
commit 08f4dcd7f2
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/unknown_00BC20/func_8001D80C.s → asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_8001D80C
glabel calc_dynamic_lighting_for_object_1
/* 01E40C 8001D80C 27BDFF60 */ addiu $sp, $sp, -0xa0
/* 01E410 8001D810 AFB20020 */ sw $s2, 0x20($sp)
/* 01E414 8001D814 AFBF003C */ sw $ra, 0x3c($sp)
asm/non_matchings/unknown_00BC20/func_8001DD54.s → asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_8001DD54
glabel calc_env_mapping_for_object
/* 01E954 8001DD54 27BDFEE8 */ addiu $sp, $sp, -0x118
/* 01E958 8001DD58 AFBF003C */ sw $ra, 0x3c($sp)
/* 01E95C 8001DD5C AFBE0038 */ sw $fp, 0x38($sp)
asm/non_matchings/unknown_00BC20/func_800120C8.s
+2 -2
View File
@@ -116,7 +116,7 @@ glabel func_800120C8
/* 012E78 80012278 8FA40078 */ lw $a0, 0x78($sp)
/* 012E7C 8001227C 8E270000 */ lw $a3, ($s1)
/* 012E80 80012280 02402825 */ move $a1, $s2
/* 012E84 80012284 0C0075B9 */ jal func_8001D6E4
/* 012E84 80012284 0C0075B9 */ jal calc_dyn_light_and_env_map_for_object
/* 012E88 80012288 00003025 */ move $a2, $zero
/* 012E8C 8001228C 1000000D */ b .L800122C4
/* 012E90 80012290 00000000 */ nop
@@ -125,7 +125,7 @@ glabel func_800120C8
/* 012E98 80012298 02402825 */ move $a1, $s2
/* 012E9C 8001229C 8FA40078 */ lw $a0, 0x78($sp)
/* 012EA0 800122A0 8E270000 */ lw $a3, ($s1)
/* 012EA4 800122A4 0C0075B9 */ jal func_8001D6E4
/* 012EA4 800122A4 0C0075B9 */ jal calc_dyn_light_and_env_map_for_object
/* 012EA8 800122A8 2406FFFF */ li $a2, -1
/* 012EAC 800122AC 10000005 */ b .L800122C4
/* 012EB0 800122B0 00000000 */ nop
asm/unknown_0251F0.s
+1 -1
View File
@@ -8,4 +8,4 @@
.set gp=64 # 64-bit instructions are used
.include "asm/unknown_0251F0/func_800245F0.s"
.include "asm/unknown_0251F0/func_80024744.s"
.include "asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s"
asm/unknown_0251F0/func_80024744.s → asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_80024744
glabel calc_dynamic_lighting_for_object_2
/* 025344 80024744 27BDFF80 */ addiu $sp, $sp, -0x80
/* 025348 80024748 AFB00080 */ sw $s0, 0x80($sp)
/* 02534C 8002474C AFBF0078 */ sw $ra, 0x78($sp)
src/unknown_00BC20.c
+8 -8
View File
@@ -310,8 +310,8 @@ typedef struct unk8001D6E4_arg1 {
/* 0x40 */ unk8001D6E4_arg1_40 *unk40;
} unk8001D6E4_arg1;
void func_8001D80C(unk8001D6E4_arg1 *, ObjectModel *, s16, unk8001D6E4_arg1 *, f32, f32);
void func_80024744(unk8001D6E4_arg1 *, ObjectModel *, s16, f32);
void calc_dynamic_lighting_for_object_1(unk8001D6E4_arg1 *, ObjectModel *, s16, unk8001D6E4_arg1 *, f32, f32);
void calc_dynamic_lighting_for_object_2(unk8001D6E4_arg1 *, ObjectModel *, s16, f32);
void func_8000C460(void);
@@ -1395,7 +1395,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D2A0.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D4B4.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D5E0.s")
void func_8001D6E4(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) {
void calc_dyn_light_and_env_map_for_object(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) {
s16 environmentMappingEnabled;
s32 dynamicLightingEnabled;
s16 i;
@@ -1416,21 +1416,21 @@ void func_8001D6E4(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) {
// Calculates dynamic lighting for the object
if (object->descriptor_ptr->unk71 != 0) {
// Dynamic lighting for some objects? (Intro diddy, Taj, T.T., Bosses)
func_8001D80C(object, arg0, arg2, object, arg3, 1.0f);
calc_dynamic_lighting_for_object_1(object, arg0, arg2, object, arg3, 1.0f);
} else {
// Dynamic lighting for other objects? (Racers, Rare logo, Wizpig face, etc.)
func_80024744(object, arg0, arg2, arg3);
calc_dynamic_lighting_for_object_2(object, arg0, arg2, arg3);
}
}
if (environmentMappingEnabled) {
// Calculates environment mapping for the object
func_8001DD54(arg0, object->z_rotation, object->x_rotation, object->y_rotation);
calc_env_mapping_for_object(arg0, object->z_rotation, object->x_rotation, object->y_rotation);
}
}
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D80C.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001DD54.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001E13C.s")
s32 *func_8001E29C(s32 arg0) {