From 7537984f584df40cc9ce669314bcbdbdb0de1982 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 18 Dec 2020 19:12:41 +0900 Subject: [PATCH] clean --- src/code_25f00_len_940.c | 4 ++-- src/code_26840_len_20d0.c | 2 +- src/code_28910_len_5090.c | 34 +++++++++++++++++----------------- src/code_2d9a0_len_890.c | 2 +- src/code_d0a70_len_4fe0.c | 24 ++++++++++++++---------- src/code_d5a50_len_5fd0.c | 20 +++++++++++--------- 6 files changed, 46 insertions(+), 40 deletions(-) diff --git a/src/code_25f00_len_940.c b/src/code_25f00_len_940.c index ad0c604e93..7161120d3a 100644 --- a/src/code_25f00_len_940.c +++ b/src/code_25f00_len_940.c @@ -23,8 +23,8 @@ void nuAuPreNMIFuncSet(NUAuPreNMIFunc func) { INCLUDE_ASM(s32, "code_25f00_len_940", func_8004AE08); -s32 nuAuDmaCallBack(s32 addr, s32 len, void* state); -INCLUDE_ASM(s32, "code_25f00_len_940", nuAuDmaCallBack, s32 addr, s32 len, void* state); +s32 nuAuDmaCallBack(s32 addr, s32 len, void* state, s32 arg3); +INCLUDE_ASM(s32, "code_25f00_len_940", nuAuDmaCallBack, s32 addr, s32 len, void* state, s32 arg3); ALDMAproc nuAuDmaNew(NUDMAState** state) { if (!nuAuDmaState.initialized) { diff --git a/src/code_26840_len_20d0.c b/src/code_26840_len_20d0.c index e1607a0cf7..8b8181fa4b 100644 --- a/src/code_26840_len_20d0.c +++ b/src/code_26840_len_20d0.c @@ -1,7 +1,7 @@ #include "common.h" #include "audio.h" -void func_8004B440(UnkAl6CC *arg0, u8 arg1, u8 arg2, UnkAl19E0 *arg3, u8 arg4) { +void func_8004B440(UnkAl6CC* arg0, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 arg4) { u32 i; s32 c = 0x6A25E; diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c index cba5acbcb5..e9b74f6f0b 100644 --- a/src/code_28910_len_5090.c +++ b/src/code_28910_len_5090.c @@ -119,7 +119,7 @@ INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC04); INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC68); -void func_8004FBBC(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FBBC(UnkAlA9C* arg0, UnkAl3* arg1) { u32 unk_D4 = arg0->unk_D4.u16; s32 temp_v0; @@ -152,7 +152,7 @@ s32 func_8004FC08(UnkAlA9C* arg0, u32 arg1) { } // todo clean the below -void func_8004FCB4(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FCB4(UnkAlA9C* arg0, UnkAl3* arg1) { s32 temp_v0; s32 phi_v0; @@ -170,16 +170,16 @@ void func_8004FCB4(UnkAlA9C *arg0, UnkAl3 *arg1) { arg1->unk_41 = 1; } -void func_8004FCE4(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FCE4(UnkAlA9C* arg0, UnkAl3* arg1) { arg0->unk_20C = (s8)arg0->unk_D4.u8[0] * 100; } -void func_8004FD04(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FD04(UnkAlA9C* arg0, UnkAl3* arg1) { arg0->unk_00->unk_40[arg0->unk_235].unk_00 = arg0->unk_D4.u8[0]; arg0->unk_00->unk_40[arg0->unk_235].unk_01 = 1; } -void func_8004FD38(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FD38(UnkAlA9C* arg0, UnkAl3* arg1) { u8 unk_D4 = arg0->unk_D4.u8[0]; u32 temp_v1 = arg0->unk_4C[unk_D4]; @@ -202,61 +202,61 @@ INCLUDE_ASM(void, "code_28910_len_5090", func_8004FEB0, UnkAlA9C* arg0, UnkAl3* INCLUDE_ASM(void, "code_28910_len_5090", func_8004FED0, UnkAlA9C* arg0, UnkAl3* arg1); -void func_8004FF3C(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FF3C(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_4A = arg0->unk_D4.u8[0] & 0x7F; arg1->unk_57 = 0; arg1->unk_42 = 1; } -void func_8004FF58(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FF58(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_4B = arg0->unk_D4.u8[0] & 0x7F; arg1->unk_43 = 1; } -void func_8004FF70(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FF70(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_49 = arg0->unk_D4.u8[0] & 0x7F; arg1->unk_41 = 1; } -void func_8004FF88(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FF88(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_46 = (s8)arg0->unk_D4.u8[0] * 100; } -void func_8004FFA8(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FFA8(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_48 = arg0->unk_D4.u8[0]; } -void func_8004FFB4(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FFB4(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_38 = arg0->unk_D4.u16; arg1->unk_40 = 1; } -void func_8004FFC8(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FFC8(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_3A = arg0->unk_D4.u8[0]; arg1->unk_55 = arg0->unk_D4.u8[1]; arg1->unk_56 = arg0->unk_D6; } -void func_8004FFE4(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FFE4(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_55 = arg0->unk_D4.u8[0]; } -void func_8004FFF0(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FFF0(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_56 = arg0->unk_D4.u8[0]; } -void func_8004FFFC(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_8004FFFC(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_56 = 0; } -void func_80050004(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_80050004(UnkAlA9C* arg0, UnkAl3* arg1) { arg1->unk_4A = arg0->unk_D4.u8[0] & 0x7F; arg1->unk_57 = arg0->unk_D4.u8[1] & 0x7F; } INCLUDE_ASM(void, "code_28910_len_5090", func_80050020, UnkAlA9C* arg0, UnkAl3* arg1); -void func_80050128(UnkAlA9C *arg0, UnkAl3 *arg1) { +void func_80050128(UnkAlA9C* arg0, UnkAl3* arg1) { u8 temp_v0 = arg0->unk_D4.u8[0]; u8 temp_v1 = arg0->unk_4C[temp_v0]; diff --git a/src/code_2d9a0_len_890.c b/src/code_2d9a0_len_890.c index a8583fb218..53f4b3b5f7 100644 --- a/src/code_2d9a0_len_890.c +++ b/src/code_2d9a0_len_890.c @@ -36,7 +36,7 @@ void func_80052614(UnkAl19E0* arg0) { INCLUDE_ASM(void, "code_2d9a0_len_890", func_80052660, UnkAl19E0* arg0); -void func_80052B44(UnkAl48 *arg0) { +void func_80052B44(UnkAl48* arg0) { s32 temp_lo = ((arg0->unk_3A * arg0->unk_40 * arg0->unk_3F) >> 14) * arg0->unk_30; arg0->unk_0C = temp_lo >> 7; diff --git a/src/code_d0a70_len_4fe0.c b/src/code_d0a70_len_4fe0.c index e66d8d60fb..9d94ce162a 100644 --- a/src/code_d0a70_len_4fe0.c +++ b/src/code_d0a70_len_4fe0.c @@ -5,7 +5,8 @@ s32 D_8014EE10[] = { 0x80156920, }; s32 D_8014EE14[] = { 0x00000000, }; s32 D_8014EE18[] = { 0x90909000, 0x90909000, 0xFFFFFF00, 0xFFFFFF00, 0x00007800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, - 0x00008800, 0x00000000, }; + 0x00008800, 0x00000000, + }; s32 D_8014EE40[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; @@ -14,19 +15,22 @@ s32 D_8014EE50[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x02000000, }; s32 D_8014EE60[] = { 0x012C0000, 0x00000000, }; s32 D_8014EE68[] = { 0xD9FDF9FF, 0x00000000, 0xD9FFFFFF, 0x00200005, 0xD7000002, 0xFFFFFFFF, 0xE2001E01, 0x00000000, - 0xE3000A11, 0x00082CF0, 0xDF000000, 0x00000000, }; + 0xE3000A11, 0x00082CF0, 0xDF000000, 0x00000000, + }; s32 D_8014EE98[] = { 0x00441208, 0x00111208, 0x00000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, - 0x01000000, 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, - 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, - 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, - 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, - 0x00111208, 0x00000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, - 0x00441208, 0x00111208, 0x00000000, }; + 0x01000000, 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, + 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, + 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, + 0x01000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, 0x00441208, + 0x00111208, 0x00000000, 0x00441208, 0x00111208, 0x00000000, 0x00404B40, 0x00104B40, 0x01000000, + 0x00441208, 0x00111208, 0x00000000, + }; s32 D_8014EF64[] = { 0x00014358, 0x00018200, 0x0001A858, 0x0001E830, 0x00029458, 0x000314E0, 0x00033498, 0x00038988, - 0x00039228, 0x0005B7A8, 0x0007CF10, 0x00086490, 0x00096258, 0x000A1820, 0x000ACDE8, 0x000BBF68, - 0x000C0490, 0x000C49B8, 0x000C6150, 0x000CA380, 0x00000000, 0x00000000, 0x00000000, }; + 0x00039228, 0x0005B7A8, 0x0007CF10, 0x00086490, 0x00096258, 0x000A1820, 0x000ACDE8, 0x000BBF68, + 0x000C0490, 0x000C49B8, 0x000C6150, 0x000CA380, 0x00000000, 0x00000000, 0x00000000, + }; #define UNKSTRUCT8013A854_SIZE 90 diff --git a/src/code_d5a50_len_5fd0.c b/src/code_d5a50_len_5fd0.c index 1cbc487c12..873b2bf4e7 100644 --- a/src/code_d5a50_len_5fd0.c +++ b/src/code_d5a50_len_5fd0.c @@ -4,16 +4,18 @@ s32 D_8014EFC0[] = { 0x00000000, }; s32 D_8014EFC4[] = { 0x00011000, }; s32 D_8014EFC8[] = { 0x00000000, }; s32 D_8014EFCC[] = { 0x00080008, 0x00200010, 0x00100080, 0x00180018, 0x01200020, 0x00200200, 0x00300030, 0x04800040, - 0x00400800, 0x00080010, 0x00400010, 0x00080040, 0x00100018, 0x00C00010, 0x00200100, 0x00400020, - 0x04000020, 0x00100100, 0x000C000C, 0x00480030, 0x00180240, 0x00200008, 0x00800018, 0x00080060, - 0x00400010, 0x02000010, 0x00400200, 0x00C00020, 0x0C000028, 0x00280320, 0x00180010, 0x00C00020, - 0x00280280, 0x00280010, 0x01400028, 0x001801E0, 0x00200018, 0x01800014, 0x00200000, 0x00220020, - 0x00000028, 0x002803C8, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, 0x00000000, 0xE3000A11, - 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, - 0x00000000, 0xE3000A11, 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, }; + 0x00400800, 0x00080010, 0x00400010, 0x00080040, 0x00100018, 0x00C00010, 0x00200100, 0x00400020, + 0x04000020, 0x00100100, 0x000C000C, 0x00480030, 0x00180240, 0x00200008, 0x00800018, 0x00080060, + 0x00400010, 0x02000010, 0x00400200, 0x00C00020, 0x0C000028, 0x00280320, 0x00180010, 0x00C00020, + 0x00280280, 0x00280010, 0x01400028, 0x001801E0, 0x00200018, 0x01800014, 0x00200000, 0x00220020, + 0x00000028, 0x002803C8, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, 0x00000000, 0xE3000A11, + 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, + 0x00000000, 0xE3000A11, 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, + }; s32 D_8014F0C8[] = { 0xFFF40000, 0x00000000, 0x08000800, 0x000000FF, 0x00330000, 0x00000000, 0x00000800, 0x000000FF, - 0x0033003F, 0x00000000, 0x00000000, 0x000000FF, 0xFFF4003F, 0x00000000, 0x08000000, 0x000000FF, - 0xFFFFFF00, 0xFFFFFF00, }; + 0x0033003F, 0x00000000, 0x00000000, 0x000000FF, 0xFFF4003F, 0x00000000, 0x08000000, 0x000000FF, + 0xFFFFFF00, 0xFFFFFF00, + }; s32 D_8014F110[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 };