From 3691babd039eda5719321bb2b00bbb9cab64f568 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 23 Sep 2020 23:54:33 -0400 Subject: [PATCH] format --- src/code_303c0_len_3e10.c | 4 ++-- src/code_a5dd0_len_114e0.c | 2 +- src/code_b72b0_len_15ed0.c | 5 +++-- src/code_de740_len_23f0.c | 3 ++- src/code_e0b30_len_b80.c | 3 ++- src/os/code_3c310_len_180.c | 2 +- src/os/code_3d330_len_990.c | 8 ++++---- src/os/code_3dcc0_len_a60.c | 11 ++++++----- src/os/code_3e720_len_5f0.c | 4 ++-- src/os/code_3ef90_len_600.c | 7 ++++--- src/os/code_3f310_len_3c0.c | 4 ++-- src/os/code_41750_len_450.c | 2 +- src/os/code_41ba0_len_c0.c | 2 +- src/os/code_42de0_len_90.c | 3 ++- src/os/code_42e70_len_390.c | 2 +- src/os/code_43200_len_7c0.c | 2 +- src/os/code_43be0_len_5e0.c | 2 +- src/os/code_441c0_len_1c0.c | 3 ++- src/os/osCreateThread.c | 5 +++-- 19 files changed, 41 insertions(+), 33 deletions(-) diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c index ca8c776677..3f848999a5 100644 --- a/src/code_303c0_len_3e10.c +++ b/src/code_303c0_len_3e10.c @@ -142,7 +142,7 @@ INCLUDE_ASM("code_303c0_len_3e10", func_80056250); INCLUDE_ASM("code_303c0_len_3e10", func_800565A4); -INCLUDE_ASM_T(Acmd*, "code_303c0_len_3e10", alAudioFrame, Acmd *cmdList, s32 *cmdLen, s16 *outBuf, s32 outLen); +INCLUDE_ASM_T(Acmd*, "code_303c0_len_3e10", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen); INCLUDE_ASM("code_303c0_len_3e10", func_80056D34); @@ -211,7 +211,7 @@ INCLUDE_ASM("code_303c0_len_3e10", func_80057ED0); INCLUDE_ASM("code_303c0_len_3e10", func_80057F20); #undef alHeapAlloc -INCLUDE_ASM_T(void, "code_303c0_len_3e10", alHeapAlloc, u8 *file, s32 line, ALHeap *hp, s32 num, s32 size); +INCLUDE_ASM_T(void, "code_303c0_len_3e10", alHeapAlloc, u8* file, s32 line, ALHeap* hp, s32 num, s32 size); INCLUDE_ASM("code_303c0_len_3e10", func_80057FD8); diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 1002f053f0..671f85cb3c 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -219,7 +219,7 @@ INCLUDE_ASM("code_a5dd0_len_114e0", get_model_list_index_from_tree_index); INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B090); INCLUDE_ASM_T(void, "code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, - f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); + f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B1C0); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index d4c623000b..20bd600df4 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -202,8 +202,9 @@ INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity); INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity_nodelay); -INCLUDE_ASM_T(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1, s32 unk2, - s32 unk3); +INCLUDE_ASM_T(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1, + s32 unk2, + s32 unk3); INCLUDE_ASM("code_b72b0_len_15ed0", init_got_item); diff --git a/src/code_de740_len_23f0.c b/src/code_de740_len_23f0.c index 98faafa56a..893ee91d71 100644 --- a/src/code_de740_len_23f0.c +++ b/src/code_de740_len_23f0.c @@ -62,7 +62,8 @@ void play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { } } -INCLUDE_ASM_T(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); +INCLUDE_ASM_T(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, + f32 posZ); INCLUDE_ASM("code_de740_len_23f0", func_80149E04); diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index 770e4d372b..265d8db887 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -13,7 +13,8 @@ INCLUDE_ASM("code_e0b30_len_b80", func_8014A548); INCLUDE_ASM("code_e0b30_len_b80", _set_music_track); -INCLUDE_ASM_T(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); +INCLUDE_ASM_T(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, + s32 volume); INCLUDE_ASM("code_e0b30_len_b80", func_8014A964); diff --git a/src/os/code_3c310_len_180.c b/src/os/code_3c310_len_180.c index ec522e9b7d..efc48142e3 100644 --- a/src/os/code_3c310_len_180.c +++ b/src/os/code_3c310_len_180.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(OSPiHandle* , "os/code_3c310_len_180", osCartRomInit, void); +INCLUDE_ASM_T(OSPiHandle*, "os/code_3c310_len_180", osCartRomInit, void); diff --git a/src/os/code_3d330_len_990.c b/src/os/code_3d330_len_990.c index 7e24b3e601..6466db509c 100644 --- a/src/os/code_3d330_len_990.c +++ b/src/os/code_3d330_len_990.c @@ -1,13 +1,13 @@ #include "common.h" INCLUDE_ASM_T(void, "os/code_3d330_len_990", guFrustumF, float mf[4][4], float l, float r, float b, float t, float n, - float f, float scale); + float f, float scale); INCLUDE_ASM_T(void, "os/code_3d330_len_990", guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f, - float scale); + float scale); INCLUDE_ASM_T(void, "os/code_3d330_len_990", guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt, - float yAt, float zAt, float xUp, float yUp, float zUp); + float yAt, float zAt, float xUp, float yUp, float zUp); INCLUDE_ASM_T(void, "os/code_3d330_len_990", guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt, - float zAt, float xUp, float yUp, float zUp); + float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3dcc0_len_a60.c b/src/os/code_3dcc0_len_a60.c index 4b7f42da27..e274b59760 100644 --- a/src/os/code_3dcc0_len_a60.c +++ b/src/os/code_3dcc0_len_a60.c @@ -1,9 +1,10 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, float yEye, - float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, - float zl1, float xl2, float yl2, float zl2, int twidth, int theight); +INCLUDE_ASM_T(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, + float yEye, + float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, + float zl1, float xl2, float yl2, float zl2, int twidth, int theight); INCLUDE_ASM_T(void, "os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, - float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, - float zl1, float xl2, float yl2, float zl2, int twidth, int theight); + float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, + float zl1, float xl2, float yl2, float zl2, int twidth, int theight); diff --git a/src/os/code_3e720_len_5f0.c b/src/os/code_3e720_len_5f0.c index 57924fab55..d9ce162fbb 100644 --- a/src/os/code_3e720_len_5f0.c +++ b/src/os/code_3e720_len_5f0.c @@ -1,7 +1,7 @@ #include "common.h" INCLUDE_ASM_T(void, "os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, - float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); + float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); INCLUDE_ASM_T(void, "os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, - float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); + float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3ef90_len_600.c b/src/os/code_3ef90_len_600.c index e754530847..0c3e744e29 100644 --- a/src/os/code_3ef90_len_600.c +++ b/src/os/code_3ef90_len_600.c @@ -1,7 +1,8 @@ #include "common.h" INCLUDE_ASM_T(void, "os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, - float near, float far, float scale); + float near, float far, float scale); -INCLUDE_ASM_T(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, float near, - float far, float scale); +INCLUDE_ASM_T(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, + float near, + float far, float scale); diff --git a/src/os/code_3f310_len_3c0.c b/src/os/code_3f310_len_3c0.c index 4202a994f4..966005770b 100644 --- a/src/os/code_3f310_len_3c0.c +++ b/src/os/code_3f310_len_3c0.c @@ -1,7 +1,7 @@ #include "common.h" INCLUDE_ASM_T(void, "os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x, - float y, float z); + float y, float z); INCLUDE_ASM_T(void, "os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, - float z); + float z); diff --git a/src/os/code_41750_len_450.c b/src/os/code_41750_len_450.c index 83e2f725c6..72224ff0b9 100644 --- a/src/os/code_41750_len_450.c +++ b/src/os/code_41750_len_450.c @@ -1,7 +1,7 @@ #include "common.h" INCLUDE_ASM_T(int, "os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, - OSMesg mesg); + OSMesg mesg); INCLUDE_API_ASM("os/code_41750_len_450", osTimerServicesInit); diff --git a/src/os/code_41ba0_len_c0.c b/src/os/code_41ba0_len_c0.c index 6f45d837a0..f90373a0e1 100644 --- a/src/os/code_41ba0_len_c0.c +++ b/src/os/code_41ba0_len_c0.c @@ -1,4 +1,4 @@ #include "common.h" INCLUDE_ASM_T(void, "os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, - s32 unk3); + s32 unk3); diff --git a/src/os/code_42de0_len_90.c b/src/os/code_42de0_len_90.c index 1d70357c58..fa8e6b01ca 100644 --- a/src/os/code_42de0_len_90.c +++ b/src/os/code_42de0_len_90.c @@ -1,3 +1,4 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, float* oz); +INCLUDE_ASM_T(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, + float* oz); diff --git a/src/os/code_42e70_len_390.c b/src/os/code_42e70_len_390.c index c388086b3c..49bca3aa09 100644 --- a/src/os/code_42e70_len_390.c +++ b/src/os/code_42e70_len_390.c @@ -1,7 +1,7 @@ #include "common.h" INCLUDE_ASM_T(void, "os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, - float* oz); + float* oz); INCLUDE_ASM_T(void, "os/code_42e70_len_390", guRotateF, float mf[4][4], float a, float x, float y, float z); diff --git a/src/os/code_43200_len_7c0.c b/src/os/code_43200_len_7c0.c index 73c4b95273..5c224e3dfb 100644 --- a/src/os/code_43200_len_7c0.c +++ b/src/os/code_43200_len_7c0.c @@ -5,6 +5,6 @@ INCLUDE_API_ASM("os/code_43200_len_7c0", osMotorAccess); INCLUDE_ASM_T(s32, "os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); INCLUDE_ASM_T(s32, "os/code_43200_len_7c0", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, - int unk5, s32* unk6); + int unk5, s32* unk6); INCLUDE_API_ASM("os/code_43200_len_7c0", osPfsDeclearPage); diff --git a/src/os/code_43be0_len_5e0.c b/src/os/code_43be0_len_5e0.c index ea86e0b1c1..ff6d75090d 100644 --- a/src/os/code_43be0_len_5e0.c +++ b/src/os/code_43be0_len_5e0.c @@ -1,6 +1,6 @@ #include "common.h" INCLUDE_ASM_T(s32, "os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, - u8* unk5); + u8* unk5); INCLUDE_ASM_T(s32, "os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); diff --git a/src/os/code_441c0_len_1c0.c b/src/os/code_441c0_len_1c0.c index 97be0579e9..b3b3a354ee 100644 --- a/src/os/code_441c0_len_1c0.c +++ b/src/os/code_441c0_len_1c0.c @@ -1,3 +1,4 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, s32* unk5); +INCLUDE_ASM_T(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, + s32* unk5); diff --git a/src/os/osCreateThread.c b/src/os/osCreateThread.c index bdd3f2deca..c702a55bc0 100644 --- a/src/os/osCreateThread.c +++ b/src/os/osCreateThread.c @@ -1,4 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*), void* unk1, - void* unk2, OSPri pri); +INCLUDE_ASM_T(void, "os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*), + void* unk1, + void* unk2, OSPri pri);