From 506118c6e1b6b8fa08d4d5029715f5631a352e8e Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Sat, 12 Jun 2021 01:25:00 -0700 Subject: [PATCH] Renamed D_80019808 to func_80019808 --- asm/non_matchings/unknown_003260/audioNewThread.s | 4 ++-- asm/non_matchings/unknown_00BC20/func_80010994.s | 2 +- .../unknown_00BC20/{D_80019808.s => func_80019808.s} | 2 +- src/unknown_00BC20.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename asm/non_matchings/unknown_00BC20/{D_80019808.s => func_80019808.s} (99%) diff --git a/asm/non_matchings/unknown_003260/audioNewThread.s b/asm/non_matchings/unknown_003260/audioNewThread.s index 1713d444..dd9a6460 100644 --- a/asm/non_matchings/unknown_003260/audioNewThread.s +++ b/asm/non_matchings/unknown_003260/audioNewThread.s @@ -146,9 +146,9 @@ glabel audioNewThread /* 003488 80002888 A48C0000 */ sh $t4, ($a0) /* 00348C 8000288C 84860000 */ lh $a2, ($a0) /* 003490 80002890 2508C68C */ addiu $t0, %lo(D_800DC68C) # addiu $t0, $t0, -0x3974 -/* 003494 80002894 3C0D8002 */ lui $t5, %hi(D_80019808) # $t5, 0x8002 +/* 003494 80002894 3C0D8002 */ lui $t5, %hi(func_80019808) # $t5, 0x8002 /* 003498 80002898 AE420010 */ sw $v0, 0x10($s2) -/* 00349C 8000289C 25AD9808 */ addiu $t5, %lo(D_80019808) # addiu $t5, $t5, -0x67f8 +/* 00349C 8000289C 25AD9808 */ addiu $t5, %lo(func_80019808) # addiu $t5, $t5, -0x67f8 /* 0034A0 800028A0 A1000000 */ sb $zero, ($t0) /* 0034A4 800028A4 3C05800E */ lui $a1, %hi(D_800DC694) # $a1, 0x800e /* 0034A8 800028A8 8CA5C694 */ lw $a1, %lo(D_800DC694)($a1) diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index 8ca113fe..e9c8ed1a 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -437,7 +437,7 @@ glabel func_80010994 /* 011BCC 80010FCC 00000000 */ nop /* 011BD0 80010FD0 15200007 */ bnez $t1, .L80010FF0 /* 011BD4 80010FD4 00000000 */ nop -/* 011BD8 80010FD8 0C006602 */ jal D_80019808 +/* 011BD8 80010FD8 0C006602 */ jal func_80019808 /* 011BDC 80010FDC 02802025 */ move $a0, $s4 /* 011BE0 80010FE0 3C078012 */ lui $a3, %hi(playerCount) # $a3, 0x8012 /* 011BE4 80010FE4 8CE7AEF0 */ lw $a3, %lo(playerCount)($a3) diff --git a/asm/non_matchings/unknown_00BC20/D_80019808.s b/asm/non_matchings/unknown_00BC20/func_80019808.s similarity index 99% rename from asm/non_matchings/unknown_00BC20/D_80019808.s rename to asm/non_matchings/unknown_00BC20/func_80019808.s index e4d09db7..56779858 100644 --- a/asm/non_matchings/unknown_00BC20/D_80019808.s +++ b/asm/non_matchings/unknown_00BC20/func_80019808.s @@ -1,4 +1,4 @@ -glabel D_80019808 +glabel func_80019808 /* 01A408 80019808 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 01A40C 8001980C AFBF0034 */ sw $ra, 0x34($sp) /* 01A410 80019810 AFB60030 */ sw $s6, 0x30($sp) diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index c2f9f827..6c82a2d2 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -1169,7 +1169,7 @@ Player * func_80018C6C(void){ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80018CE0.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001955C.s") -GLOBAL_ASM("asm/non_matchings/unknown_00BC20/D_80019808.s") +GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80019808.s") GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001A7D8.s") void func_8001A8D4(s32 arg0) {