mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-04 08:21:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

T6.c2: unalias func_801851DC and func_8018A224 in their own TUs (decls now agree)

Browse Source
This commit is contained in:
Drew T
2026-10-02 16:46:46 -06:00
parent cda103fe46
commit fa2f50529c
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ov_SC03_002/ov_SC03_002_jr_8018431C.c
+4 -3
View File
@@ -3692,15 +3692,16 @@ void func_801851A0(void *a0) {
* ORACLE: .venv/bin/python tools/match_one.py func_801851DC \
* --c .run/s7/ov_SC04_018/func_801851DC.c \
* --asm-subdir asm/ov_SC04_018/nonmatchings/ov_SC04_018_jr_8017AE2C -> MATCH (31 ins)
*
* P39 T6.c2: alias removed; this TU's decl (`extern s32 func_801851DC(void *a0)`) now
* agrees, so the def carries its own name (make check ov_SC03_002 rc=0).
*/
extern s32 func_80184F6C(void);
extern s32 func_80178BF8(); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2539) */
extern void func_80172710(void); /* TU-canonical (ov_SC04_018_jr_8017AE2C.c L2231) */
s32 aF8018CB18(void *a0) __asm__("func_801851DC");
s32 aF8018CB18(void *a0)
s32 func_801851DC(void *a0)
{
if (*(u16 *)(*(s32 *)((s32)a0 + 0x64) + 0x2) != 1) {
return 0;
src/ov_SC03_014/ov_SC03_014_jr_801848E4.c
+5 -5
View File
@@ -5808,7 +5808,7 @@ extern s32 func_8012C658(s32 arg0, s32 arg1, s32 arg2);
extern void func_8012CAE4(void *a0);
extern void func_8012A828(s32 a0, void *a1);
/* not declared anywhere in the TU */
extern s32 func_8018A224(param_1);
extern s32 func_8018A224(void *param_1);
extern u8 D_801E2F88[];
extern u8 D_8018B898[];
@@ -6135,8 +6135,10 @@ void func_8018A0F4(void *a0) {
* alias aF8018A224 with an asm label emits the identical `func_8018A224`
* symbol while leaving the TU's own declaration untouched — zero blast
* radius, zero emitted-instruction change.
* P39 T6.c2: alias removed; the TU decl is now `extern s32 func_8018A224(void *param_1)`,
* so the def carries its own name (make check ov_SC03_014 rc=0).
*/
extern s32 *D_80126B78; /* TU L72 */
extern s32 *D_80126B78; /* TU L72 */
extern s32 func_80135888(s32 a0, s32 a1, s32 a2, s32 a3); /* TU L585 */
extern void func_80172710(void); /* TU L2226 */
extern s32 func_80178BF8(); /* TU L2534 */
@@ -6145,9 +6147,7 @@ extern s32 func_8012BDBC(s32 a0, s32 a1); /* not in TU */
extern u8 D_801E32B0[]; /* not in TU */
s32 aF8018A224() __asm__("func_8018A224");
s32 aF8018A224(param_1)
s32 func_8018A224(param_1)
void *param_1;
{
s32 *m;