From 08f4dcd7f264d25839ecc0b991013e5d91bb40ff Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 24 Jun 2021 13:34:20 -0500 Subject: [PATCH] Renamed 4 functions in unknown_00BC20 --- ...0C.s => calc_dynamic_lighting_for_object_1.s} | 2 +- ..._8001DD54.s => calc_env_mapping_for_object.s} | 2 +- asm/non_matchings/unknown_00BC20/func_800120C8.s | 4 ++-- asm/unknown_0251F0.s | 2 +- ...44.s => calc_dynamic_lighting_for_object_2.s} | 2 +- src/unknown_00BC20.c | 16 ++++++++-------- 6 files changed, 14 insertions(+), 14 deletions(-) rename asm/non_matchings/unknown_00BC20/{func_8001D80C.s => calc_dynamic_lighting_for_object_1.s} (99%) rename asm/non_matchings/unknown_00BC20/{func_8001DD54.s => calc_env_mapping_for_object.s} (99%) rename asm/unknown_0251F0/{func_80024744.s => calc_dynamic_lighting_for_object_2.s} (99%) diff --git a/asm/non_matchings/unknown_00BC20/func_8001D80C.s b/asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s similarity index 99% rename from asm/non_matchings/unknown_00BC20/func_8001D80C.s rename to asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s index a6d77b85..f158da98 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001D80C.s +++ b/asm/non_matchings/unknown_00BC20/calc_dynamic_lighting_for_object_1.s @@ -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) diff --git a/asm/non_matchings/unknown_00BC20/func_8001DD54.s b/asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s similarity index 99% rename from asm/non_matchings/unknown_00BC20/func_8001DD54.s rename to asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s index f40b5b55..c8054938 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001DD54.s +++ b/asm/non_matchings/unknown_00BC20/calc_env_mapping_for_object.s @@ -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) diff --git a/asm/non_matchings/unknown_00BC20/func_800120C8.s b/asm/non_matchings/unknown_00BC20/func_800120C8.s index 09516c62..28b01d7c 100644 --- a/asm/non_matchings/unknown_00BC20/func_800120C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800120C8.s @@ -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 diff --git a/asm/unknown_0251F0.s b/asm/unknown_0251F0.s index 08d71085..6f710adf 100644 --- a/asm/unknown_0251F0.s +++ b/asm/unknown_0251F0.s @@ -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" diff --git a/asm/unknown_0251F0/func_80024744.s b/asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s similarity index 99% rename from asm/unknown_0251F0/func_80024744.s rename to asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s index b7461d65..79b245e5 100644 --- a/asm/unknown_0251F0/func_80024744.s +++ b/asm/unknown_0251F0/calc_dynamic_lighting_for_object_2.s @@ -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) diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 0844e3ea..630d429b 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -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) {