Merge from upstream

2026-06-19 01:16:26 -07:00 · 2021-09-10 08:47:13 -04:00
parent 1e548af83b 89e20b2d15
commit 7231699c9b
24 changed files with 161 additions and 161 deletions
@@ -106,7 +106,7 @@ void init_lpfilter(ALLowPass *lp)

 GLOBAL_ASM("lib/asm/non_matchings/alFxNew/alFxNew.s")

-void alEnvmixerNew(ALEnvMixer* e, s32 arg1) {
+void alEnvmixerNew(ALEnvMixer *e, s32 arg1) {
    alFilterNew(e, &alEnvMixerPull, &alEnvmixerParam, 4);
    e->state = alHeapDBAlloc(0, 0, arg1, 1, 0x50);
    e->first = 1;
@@ -128,7 +128,7 @@ void alEnvmixerNew(ALEnvMixer* e, s32 arg1) {
    e->sources = 0;
 }

-void alLoadNew(ALLoadFilter* arg0, s32 (*arg1)(s32*), s32 arg2) {
+void alLoadNew(ALLoadFilter *arg0, s32 (*arg1)(s32*), s32 arg2) {
    alFilterNew(arg0, &alLoadPull, &alLoadParam, 0);
    arg0->state = alHeapDBAlloc(0, 0, arg2, 1, 0x20);
    arg0->lstate = alHeapDBAlloc(0, 0, arg2, 1, 0x20);
@@ -138,7 +138,7 @@ void alLoadNew(ALLoadFilter* arg0, s32 (*arg1)(s32*), s32 arg2) {
    arg0->memin = 0;
 }

-void alResampleNew(ALResampler* r, ALHeap* hp) {
+void alResampleNew(ALResampler *r, ALHeap *hp) {
    alFilterNew(r, &alResamplePull, &alResampleParam, 1);
    r->state = alHeapDBAlloc(0, 0, hp, 1, 0x20);
    r->first = 1;
@@ -150,21 +150,21 @@ void alResampleNew(ALResampler* r, ALHeap* hp) {
    r->ratio = 1.0f;
 }

-void alAuxBusNew(ALAuxBus* m, void* sources, s32 maxSources) {
+void alAuxBusNew(ALAuxBus *m, void *sources, s32 maxSources) {
    alFilterNew(m, &alAuxBusPull, &alAuxBusParam, 6);
    m->sourceCount = 0;
    m->maxSources = maxSources;
    m->sources = sources;
 }

-void alMainBusNew(ALMainBus* m, void* sources, s32 maxSources) {
+void alMainBusNew(ALMainBus *m, void *sources, s32 maxSources) {
    alFilterNew(m, &alMainBusPull, &alMainBusParam, 7);
    m->sourceCount = 0;
    m->maxSources = maxSources;
    m->sources = sources;
 }

-void alSaveNew(ALSave* f) {
+void alSaveNew(ALSave *f) {
    alFilterNew(f, &alSavePull, &alSaveParam, AL_SAVE);
    f->dramout = 0;
    f->first = 1;
@@ -17,7 +17,7 @@ s32 D_800DCEBC = 0x20; // Currently unknown, might be a different type.

 GLOBAL_ASM("lib/asm/non_matchings/reverb/alFxPull.s")

-s32 alFxParam(void* filter, s32 paramID, void* param) {
+s32 alFxParam(void *filter, s32 paramID, void *param) {
    if (paramID == 1) {
        ((ALFilter *)filter)->source = param;
    }
@@ -19,7 +19,7 @@ typedef struct unk80063C00 {
 /* Unknown size */
 typedef struct unk80063C00_2 {
    u8  unk00[0x60];
-    unk80063C00* unk60; // Array of unk80063C00, unknown number of elements (At most 256).
+    unk80063C00 *unk60; // Array of unk80063C00, unknown number of elements (At most 256).
 } unk80063C00_2;

 u8 func_80063C00(unk80063C00_2 *arg0, u8 arg1) {
@@ -4,7 +4,7 @@

 #include "libultra_internal.h"

-extern OSThread* __osRunningThread;
+extern OSThread *__osRunningThread;

 s32 osJamMesg(OSMesgQueue *mq, OSMesg msg, s32 flag)
 {
@@ -3,8 +3,8 @@

 #include "libultra_internal.h"

-extern OSThread* __osRunningThread;
-extern OSThread* __RunQueue; //__osRunQueue
+extern OSThread *__osRunningThread;
+extern OSThread *__RunQueue; //__osRunQueue

 void osStartThread(OSThread *t)
 {
@@ -3,9 +3,9 @@

 #include "libultra_internal.h"

-extern OSViContext* __osViNext;
+extern OSViContext *__osViNext;

-void osViSwapBuffer(void* frameBufPtr){
+void osViSwapBuffer(void *frameBufPtr){
    u32 saveMask = __osDisableInt();
    __osViNext->buffer = frameBufPtr;
    __osViNext->unk00 |= 0x10;
@@ -19,8 +19,8 @@ typedef struct unk80115D48 {

 /************ .data ************/

-ALCSPlayer* gMusicPlayer = NULL;
-ALCSPlayer* gSndFxPlayer = NULL;
+ALCSPlayer *gMusicPlayer = NULL;
+ALCSPlayer *gSndFxPlayer = NULL;
 u8 musicRelativeVolume = 0x7F;
 u8 sfxRelativeVolume = 0x7F;
 u8 D_800DC640 = 1;
@@ -89,7 +89,7 @@ typedef struct unk80115D1C {
    u8 unk1;
    u8 unk2;
 } unk80115D1C;
-unk80115D1C* D_80115D1C;
+unk80115D1C *D_80115D1C;

 s32 D_80115D20;
 s32 D_80115D24;
@@ -117,12 +117,12 @@ typedef struct audioMgrConfig_s{
    u32 unk00;
    u32 unk04;
    u32 maxChannels;
-    ALHeap* hp;
+    ALHeap *hp;
    u16  unk10;
 } audioMgrConfig;

 void func_80000968(s32 arg0);
-ALCSPlayer* func_80002224(s32, s32);
+ALCSPlayer *func_80002224(s32, s32);
 void func_8000B010(ALCSPlayer*, u8);
 void    *allocate_from_main_pool_safe(u32, u32);
 void    *load_asset_section_from_rom(u32);
@@ -291,7 +291,7 @@ void play_music(u8 arg0) {
    }
 }

-void func_8000B010(ALCSPlayer* arg0, u8 arg1);
+void func_8000B010(ALCSPlayer *arg0, u8 arg1);

 void func_80000BE0(u8 arg0) {
    if (D_800DC670 == 0) {
@@ -573,7 +573,7 @@ f32 func_800015F8(void){
    u32 delta;
    f32 delta_f;
    f32 tmp;
-    f32* tmp2 = &D_80115D34;
+    f32 *tmp2 = &D_80115D34;
    
    if(audioPrevCount < current_cnt){
        delta = current_cnt - audioPrevCount;
@@ -603,7 +603,7 @@ f32 func_800015F8(void){
 }
 #endif

-void func_80001728(u8 arg0, u8* arg1, u8* arg2, u8* arg3){
+void func_80001728(u8 arg0, u8 *arg1, u8 *arg2, u8 *arg3){
    *arg1 = D_80115D1C[arg0].unk1;
    *arg2 = D_80115D1C[arg0].unk0;
    *arg3 = D_80115D1C[arg0].unk2;
@@ -625,7 +625,7 @@ void sfxSetTempo(s32 tempo){
 }


-void func_80002570(ALCSPlayer* arg0);
+void func_80002570(ALCSPlayer *arg0);

 void func_80001844(void){
    if(!D_800DC648){
@@ -758,7 +758,7 @@ typedef struct unknown_struct_80001EA8_s{
    u32     unk08;
 }unknown_struct_80001EA8;

-void func_80001EA8(u16 arg0, unknown_struct_80001EA8 arg1, u32* arg2){
+void func_80001EA8(u16 arg0, unknown_struct_80001EA8 arg1, u32 *arg2){
    if(arg2 == NULL){
        arg2 = &D_80115F84;
    }
@@ -841,7 +841,7 @@ extern void  alCSPNew(ALCSPlayer *seqp, ALSeqpConfig *config);
 extern void  alCSPSetBank(ALCSPlayer *seqp, ALBank *b);

 ALCSPlayer *func_80002224(s32 _max_voices, s32 _max_events){
-    ALCSPlayer* cseqp;
+    ALCSPlayer *cseqp;
    ALSeqpConfig config;
    
    config.maxVoices = _max_voices;
@@ -864,7 +864,7 @@ ALCSPlayer *func_80002224(s32 _max_voices, s32 _max_events){



-void func_800022BC(u8 arg0, ALCSPlayer* arg1) {
+void func_800022BC(u8 arg0, ALCSPlayer *arg1) {
    func_80002570(arg1);
    if (arg0 < ALSeqFile_80115CF8->seqCount) {
        if (arg1 == gMusicPlayer) {
@@ -879,7 +879,7 @@ void func_800022BC(u8 arg0, ALCSPlayer* arg1) {
 #if 1
 GLOBAL_ASM("asm/non_matchings/audio/func_8000232C.s")
 #else
-void func_8000232C(ALCSPlayer* seqp, void* ptr, u8* arg2, ALCSeq* seq){
+void func_8000232C(ALCSPlayer *seqp, void *ptr, u8 *arg2, ALCSeq *seq){
    if(alCSPGetState(seqp) == AL_STOPPED && *arg2){
        /*load_asset_to_address(ASSET_AUDIO, ptr, 
            (u32)((ALSeqFile_80115CF8->seqArray)[*arg2]) - get_rom_offset_of_asset(ASSET_AUDIO,0),
@@ -896,7 +896,7 @@ void func_8000232C(ALCSPlayer* seqp, void* ptr, u8* arg2, ALCSeq* seq){
 }
 #endif

-void func_80002570(ALCSPlayer* seqp){
+void func_80002570(ALCSPlayer *seqp){
    if(gMusicPlayer == seqp && D_80115D40 != 0){
        alCSPStop(seqp);
        D_80115D40 = 0;
@@ -89,12 +89,12 @@ typedef struct FontData {
 /* 0x100 */ FontCharData unk100[96];
 } FontData;

-FontData* gFonts;
+FontData *gFonts;

 typedef struct unk8012A7E8_24 {
    u8 unk00;
    u8 unk01;
-    char* unk4;
+    char *unk4;
    s16 unk8;
    s16 unkA;
    s16 unkC;
@@ -109,7 +109,7 @@ typedef struct unk8012A7E8_24 {
    u8 unk17;
    u8 unk18;
    u8 unk19;
-    struct unk8012A7E8_24* unk1C;
+    struct unk8012A7E8_24 *unk1C;
 } unk8012A7E8_24;

 /* Size: 0x28 bytes */
@@ -348,11 +348,11 @@ void set_text_background_color(s32 red, s32 green, s32 blue, s32 alpha) {
 void func_800C45A4(Gfx **dlist, unk8012A7E8 *arg1, u8 *text, s32 alignmentFlags, f32 arg4);

 // Unused?
-void func_800C4404(Gfx** displayList, char* text, s32 alignmentFlags) {
+void func_800C4404(Gfx** displayList, char *text, s32 alignmentFlags) {
    func_800C45A4(displayList, &(*D_8012A7E8)[0], text, alignmentFlags, 1.0f);
 }

-void draw_text(Gfx** displayList, s32 xpos, s32 ypos, char* text, s32 alignmentFlags) {
+void draw_text(Gfx** displayList, s32 xpos, s32 ypos, char *text, s32 alignmentFlags) {
    unk8012A7E8 *temp = &(*D_8012A7E8)[0];
    temp->xpos = (xpos == -0x8000) ? temp->unkC >> 1 : xpos;
    temp->ypos = (ypos == -0x8000) ? temp->unkE >> 1 : ypos;
@@ -360,7 +360,7 @@ void draw_text(Gfx** displayList, s32 xpos, s32 ypos, char* text, s32 alignmentF
 }

 // Unused?
-void func_800C44C0(Gfx** displayList, s32 arg1, char* text, s32 alignmentFlags) {
+void func_800C44C0(Gfx** displayList, s32 arg1, char *text, s32 alignmentFlags) {
    if (arg1 >= 0 && arg1 < 8) {
        unk8012A7E8 *temp = &D_8012A7E8[arg1];
        func_800C45A4(displayList, temp, text, alignmentFlags, 1.0f);
@@ -368,7 +368,7 @@ void func_800C44C0(Gfx** displayList, s32 arg1, char* text, s32 alignmentFlags)
 }

 // Unused?
-void func_800C4510(Gfx** displayList, s32 arg1, s32 xpos, s32 ypos, char* text, s32 alignmentFlags) {
+void func_800C4510(Gfx** displayList, s32 arg1, s32 xpos, s32 ypos, char *text, s32 alignmentFlags) {
    if (arg1 >= 0 && arg1 < 8) {
        unk8012A7E8 *temp = &D_8012A7E8[arg1];
        temp->xpos = (xpos == -0x8000) ? temp->unkC >> 1 : xpos;
@@ -20,10 +20,10 @@ typedef struct huft {

 /************ .data ************/

-huft* D_800E3760 = NULL;
-u8* D_800E3764 = NULL;
-u8* gzip_inflate_input = NULL;
-u8* gzip_inflate_output = NULL;
+huft *D_800E3760 = NULL;
+u8 *D_800E3764 = NULL;
+u8 *gzip_inflate_input = NULL;
+u8 *gzip_inflate_output = NULL;

 /*******************************/

@@ -43,7 +43,7 @@ void func_800C6170(void) {
 /**
 * Converts a little endian value to big endian.
 */
-s32 byteswap32(u8* arg0) {
+s32 byteswap32(u8 *arg0) {
    s32 value;
    value = *arg0++;
    value |= (*arg0++ << 8);
@@ -66,7 +66,7 @@ s32 gzip_inflate_block(void);
 * Decompresses gzip data.
 * Returns the pointer to the decompressed data.
 */
-u8* gzip_inflate(u8* compressedInput, u8* decompressedOutput) {
+u8 *gzip_inflate(u8 *compressedInput, u8 *decompressedOutput) {
    gzip_inflate_input = compressedInput + 5; // The compression header is 5 bytes. 
    gzip_inflate_output = decompressedOutput;
    gzip_num_bits = 0;
@@ -100,7 +100,7 @@ MemoryPoolSlot *allocate_from_memory_pool(s32, s32, u32);

 MemoryPoolSlot *new_memory_pool(MemoryPoolSlot *arg0, s32 size, s32 numSlots);
 void set_free_queue_state(s32);
-void* allocate_from_main_pool_safe(s32, u32);
+void *allocate_from_main_pool_safe(s32, u32);
 s32 *func_8006F510(void);
 void func_8006F53C(s32*);
 void func_80071440(void *dataAddress);
@@ -251,11 +251,11 @@ void *allocate_from_pool_containing_slots(MemoryPoolSlot *slots, s32 size) {
 }

 #ifdef NON_MATCHING
-void *allocate_at_address_in_main_pool(s32 size, u8* address, u32 colorTag) {
+void *allocate_at_address_in_main_pool(s32 size, u8 *address, u32 colorTag) {
    s32 *sp38;
    s32 s0;
    MemoryPoolSlot *curSlot;
-    MemoryPoolSlot* slots;
+    MemoryPoolSlot *slots;

    sp38 = func_8006F510();
    if ((gMemoryPools[0].curNumSlots + 1) == gMemoryPools[0].maxNumSlots) {
@@ -399,7 +399,7 @@ void func_80071314(void) {
 GLOBAL_ASM("asm/non_matchings/memory/free_slot_containing_address.s")
 #endif

-void func_80071440(void* data) {
+void func_80071440(void *data) {
    gFreeQueue[gFreeQueueCount].dataAddress = data;
    gFreeQueue[gFreeQueueCount].unk4 = gFreeQueueState;
    gFreeQueueCount++;
@@ -147,7 +147,7 @@ s8 D_80126540;
 s8 D_80126541;
 s32 D_80126544;
 s32 gMultiplayerSelectedNumberOfRacersCopy; // Saved version gMultiplayerSelectedNumberOfRacers?
-u32* D_80126550[67]; // lookup table?
+u32 *D_80126550[67]; // lookup table?
 s32 D_8012665C;
 s32 D_80126660;
 s32 D_80126664;
@@ -158,7 +158,7 @@ s32 D_801267D4;
 s32 D_801267D8[3];
 s32 D_801267E4;
 s32 D_801267E8;
-s8* D_801267EC;
+s8 *D_801267EC;
 s32 D_801267F0[5];
 s32 D_80126804;
 s32 D_80126808[4];
@@ -2885,7 +2885,7 @@ typedef struct unk800861C8 {
    u32 unkC;
 } unk800861C8;

-void func_800861C8(unk800861C8* arg0, s32 *arg1) {
+void func_800861C8(unk800861C8 *arg0, s32 *arg1) {
    s32 i;
    for(i = 0; i < 3; i++) {
        if (D_80126530[i]->newGame != 0) {
@@ -5306,7 +5306,7 @@ void func_80098208(void) {
 }

 extern s32 D_800E0980;
-s8* get_misc_asset(s32 arg0);
+s8 *get_misc_asset(s32 arg0);

 #if 1
 GLOBAL_ASM("asm/non_matchings/menu/menu_trophy_race_round_init.s")
@@ -5351,7 +5351,7 @@ void func_800983C0(s32 arg0) {
    s32 sp2C;
    s32 sp28;
    s32 sp24;
-    s8* sp20;
+    s8 *sp20;

    sp20 = get_misc_asset(0x1A);
    if (osTvType == TV_TYPE_PAL) {
@@ -5947,7 +5947,7 @@ void set_player_selected_vehicle(s32 playerNum, s32 index) {
    gPlayerSelectVehicle[playerNum] = index;
 }

-s8* func_8009C274(void) {
+s8 *func_8009C274(void) {
    return D_801263DC;
 }

@@ -6728,7 +6728,7 @@ f32 func_8009E9B0(s32 arg0, Gfx **arg1, s32 *arg2, s32 *arg3) {
    return 1.0f;
 }

-s64* func_8009EA6C(void) {
+s64 *func_8009EA6C(void) {
    return &D_80126448;
 }

@@ -109,7 +109,7 @@ void func_800B4A08(s32 arg0) {
 #ifdef NON_MATCHING
 // Unused. 
 // Regalloc issues. I can't get sprintf to work properly.
-void func_800B4A14(char* arg0, s32 arg1, s32 arg2, s32 arg3) {
+void func_800B4A14(char *arg0, s32 arg1, s32 arg2, s32 arg3) {
    sprintf(arg0, &arg2);
 }
 #else
@@ -23,7 +23,7 @@ extern u32 func_80003008;
 // This was needed, since there is a bss reordering issue with D_80119BD0 and gAlSndPlayer

 extern s32 D_80115F90;
-extern ALHeap* D_80115F94;
+extern ALHeap *D_80115F94;
 extern s32 D_80115F98[2];
 extern s32 D_80115FA0[3];
 extern OSThread audioThread;
@@ -97,7 +97,7 @@ void    *alHeapDBAlloc(u8 *, s32, ALHeap *, s32, s32);
 #if 1
 GLOBAL_ASM("asm/non_matchings/unknown_003260/audioNewThread.s")
 #else
-void audioNewThread(ALSynConfig* c, OSPri p, s32 arg2){
+void audioNewThread(ALSynConfig *c, OSPri p, s32 arg2){
    u32     *reg_v0;
    void    *reg_s0;
    u32     tmp_size;
@@ -182,9 +182,9 @@ void func_8000318C(s32 arg0) {

 ALMicroTime     _sndpVoiceHandler(void *node);

-void alSndPNew(audioMgrConfig* c){
+void alSndPNew(audioMgrConfig *c){
    u32 i;
-    unk800DC6BC_40* tmp1;
+    unk800DC6BC_40 *tmp1;
    ALEvent sp_38;

    gAlSndPlayer->unk44 = c->maxChannels;
@@ -261,18 +261,18 @@ GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004384.s")
 GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004520.s")


-void func_80004604(u8* arg0, u8 arg1){
+void func_80004604(u8 *arg0, u8 arg1){
    if (arg0)
        arg0[0x36]=arg1;
 }

-u8 func_8000461C(u8* arg0){
+u8 func_8000461C(u8 *arg0){
    if (arg0)
        return arg0[0x3F];
    return 0;     
 }

-void func_80004638(ALBank* bnk, s16 sndIndx, s32 arg2) {
+void func_80004638(ALBank *bnk, s16 sndIndx, s32 arg2) {
    func_80004668(bnk, sndIndx, 0, arg2);
 }

@@ -280,12 +280,12 @@ void func_80004638(ALBank* bnk, s16 sndIndx, s32 arg2) {
 #if 1
 GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004668.s")
 #else
-void func_80004668(ALBank* bnk, s16 sndIndx, u8, s32){
+void func_80004668(ALBank *bnk, s16 sndIndx, u8, s32){
 }
 #endif

 //input typing not right (some type of struct)
-void func_8000488C(u8* arg0){
+void func_8000488C(u8 *arg0){
    ALEvent sp_18;
    sp_18.type = 1024;
    ((u32*)(&sp_18))[1] = (u32) arg0;
@@ -41,9 +41,9 @@ typedef union {
 typedef struct unk80119240
 {
    ALLink node;
-    u32    unk08;
-    u32    unk0C;
-    void*  unk10;
+    u32 unk08;
+    u32 unk0C;
+    void *unk10;
 } unk80119240;

 /* Unknown Size */
@@ -6,7 +6,7 @@
 // This file is needed, since there is a bss reordering issue with D_80119BD0 and gAlSndPlayer

 s32 D_80115F90;
-ALHeap* D_80115F94;
+ALHeap *D_80115F94;
 s32 D_80115F98[2];
 s32 D_80115FA0[3];
 OSThread audioThread;
@@ -213,7 +213,7 @@ typedef struct unknown8011AECC {
    s8 unk3A;
    s8 unk3B;
 } unknown8011AECC;
-unknown8011AECC* D_8011AECC; // Array of structs, unknown number of members
+unknown8011AECC *D_8011AECC; // Array of structs, unknown number of members
 s32 D_8011AED0;
 s32 D_8011AED4;
 s16 D_8011AED8;
@@ -242,8 +242,8 @@ s32 D_8011AF68[32];
 /* Size: 0x40 bytes */
 typedef struct unk800179D0 {
    s32 unk0;
-    u32* unk04;
-    u32* unk08;
+    u32 *unk04;
+    u32 *unk08;
    f32 unk0C[12];
    u32 unk3C;
 } unk800179D0;
@@ -257,14 +257,14 @@ s32 D_8011AFE8;
 s16 D_8011AFEC;
 s16 D_8011AFEE;
 s32 D_8011AFF0;
-unk800179D0* D_8011AFF4; 
+unk800179D0 *D_8011AFF4; 
 s32 D_8011AFF8;
 s32 D_8011AFFC;
 s32 D_8011B000;
 s32 D_8011B004;
 s32 D_8011B008;
 s32 D_8011B010[4];
-u32* D_8011B020[10];
+u32 *D_8011B020[10];
 s32 D_8011B048[4];
 s32 D_8011B058[4];
 s32 D_8011B068[4];
@@ -314,8 +314,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B290.s")
 #else 

 extern s32 D_800DC754;
-extern Object* D_800DC75C;
-extern Object* D_800DC764;
+extern Object *D_800DC75C;
+extern Object *D_800DC764;

 s32 *get_misc_asset(s32 arg0);

@@ -350,7 +350,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B38C.s")
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B750.s")
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000BADC.s")

-u32* func_8000BF44(s32 arg0) {
+u32 *func_8000BF44(s32 arg0) {
    if (arg0 == -1) {
        arg0 = D_800DC760;
    }
@@ -702,7 +702,7 @@ s32 func_8000E9C0(void) {
    return D_8011AE64;
 }

-void func_8000E9D0(Object* arg0){
+void func_8000E9D0(Object *arg0){
    arg0->unk6 |= 0x8000;
    func_800245B4(arg0->unk2C | 0xC000);
    gObjPtrList[objCount++] = arg0;
@@ -728,10 +728,10 @@ typedef struct unk8000FD20_2 {
 /* Unknown Size */
 typedef struct unk8000FD20 {
    u8 unk00[0x4C];
-    unk8000FD20_2* unk4C;
+    unk8000FD20_2 *unk4C;
 } unk8000FD20;

-s32 func_8000FD20(unk8000FD20* arg0, unk8000FD20_2* arg1) {
+s32 func_8000FD20(unk8000FD20 *arg0, unk8000FD20_2 *arg1) {
    arg0->unk4C = arg1;
    arg1->unk13 = 0xFF;
    return 0x28;
@@ -752,7 +752,7 @@ s32 func_8000FD34(unk8000FD34 *arg0, s32 arg1) {
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000FD54.s")


-void gParticlePtrList_addObject(Object* object){
+void gParticlePtrList_addObject(Object *object){
    func_800245B4(object->unk4A | 0x8000);
    gParticlePtrList[gParticleCount] = object;
    gParticleCount++;
@@ -773,7 +773,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/gParticlePtrList_flush.s")
 /*removes objects in particleList from gObjPtrList and frees*/
 void gParticlePtrList_flush(void){
    s32  j, i, search_indx, tmp;
-    Object* searchObj;
+    Object *searchObj;
    
    D_8011AE88 = 0;
    for (i = 0; i < gParticleCount; i++){
@@ -835,7 +835,7 @@ void func_80011960(Object*, s32, u32, Object_64*, u32, u32, u32, u32, f32);
 #if 1
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011960.s")
 #else
-void func_80011960(Object* arg0, s32 arg2, u32 arg3, Object_64* arg4
+void func_80011960(Object *arg0, s32 arg2, u32 arg3, Object_64 *arg4
                  , u32 arg5 , u32 arg6 , u32 arg7, u32 arg8, f32 arg9)
 {

@@ -847,7 +847,7 @@ void func_80011960(Object* arg0, s32 arg2, u32 arg3, Object_64* arg4
 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011AD0.s")
 #else
 extern f32 D_800E5550;
-void func_80011AD0(Object* this){
+void func_80011AD0(Object *this){
    f32 tmp_f0;
    u32 offset;
    switch(this->unk48){
@@ -1031,7 +1031,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80014090.s")
 void func_800142B8(void){
    s32 i =  D_8011AE60;
    s32 j;
-    Object* currObj;
+    Object *currObj;
    Object_68 *curr_68;

    for(; i < objCount; i++){
@@ -1068,7 +1068,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017978.s")
 u32 func_800179D0(void) {
    s16 i = 0;
    while(i < 16) {
-        unk800179D0* temp = &D_8011AFF4[i]; 
+        unk800179D0 *temp = &D_8011AFF4[i]; 
        if (temp->unk0 != 0) {
            temp->unk0--;
        }
@@ -1092,7 +1092,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800185E4.s")

 Object * func_80018C6C(void){
    s32 i;
-    Object* current_obj;
+    Object *current_obj;
    for(i=D_8011AE60; i < objCount; i++){
        current_obj = gObjPtrList[i];
        if(!(current_obj->unk6 & 0x8000) && (current_obj->unk48 == 62))
@@ -1343,9 +1343,9 @@ void func_8001E344(s32 arg0) {
    }
 }

-void func_8001E36C(s32 arg0, f32* arg1, f32* arg2, f32* arg3){
+void func_8001E36C(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3){
    s32 i;
-    Object* current_obj;
+    Object *current_obj;
    *arg1 = -32000.0f;
    *arg2 = -32000.0f;
    *arg3 = -32000.0f;
@@ -1490,10 +1490,10 @@ extern f32 sqrtf(f32);

 //bad regalloc
 //finds furthest object (with some additional conditions)
-Object* func_8002342C(f32 x, f32 z){
-    Object* retval = NULL;
+Object *func_8002342C(f32 x, f32 z){
+    Object *retval = NULL;
    s32 i;
-    Object* currObj = NULL;
+    Object *currObj = NULL;
    f32 x;
    f32 z;
    f32 dist;
@@ -1535,7 +1535,7 @@ void func_800235D0(s32 arg0) {

 GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800235DC.s")

-void func_800238BC(Object* arg0) {
+void func_800238BC(Object *arg0) {
    arg0->unk48 = arg0->descriptor_ptr->unk54;
    switch (arg0->unk48 - 1) {
        case 0x00:
@@ -2049,7 +2049,7 @@ void func_8002458C(s32 arg0) {

 }

-s16* func_80024594(s32 *arg0, s32 *arg1) {
+s16 *func_80024594(s32 *arg0, s32 *arg1) {
    *arg0 = D_800DC700;
    *arg1 = 0x80;
    return D_8011AC20;
@@ -54,7 +54,7 @@ f32 D_800DC8AC[27] = {
    -130.0f, 60.0f, -68.0f
 };

-LevelModel* gCurrentLevelModel = NULL;
+LevelModel *gCurrentLevelModel = NULL;
 LevelHeader *gCurrentLevelHeader2 = NULL;

 s32 D_800DC920 = -1;
@@ -614,7 +614,7 @@ void render_level_geometry_and_objects(void) {
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/render_level_geometry_and_objects.s")
 #endif

-// *Should* be functionally equivalent.
+// *Should *be functionally equivalent.
 #ifdef NON_MATCHING
 // nonOpaque: 0 for solid geometry, 1 for transparent geometry.
 void render_level_segment(s32 segmentId, s32 nonOpaque) {
@@ -789,7 +789,7 @@ void add_segment_to_order(s32 segmentIndex, u32 *segmentsOrderIndex, u8 *segment
 #ifdef NON_MATCHING
 // Unused. Has regalloc issues.
 s32 func_80029DE0(Object *obj, s32 segmentIndex) {
-    LevelModelSegmentBoundingBox* bb;
+    LevelModelSegmentBoundingBox *bb;
    s32 x, y, z;
    if (segmentIndex >= gCurrentLevelModel->numberOfSegments) {
        return FALSE;
@@ -849,7 +849,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/get_level_segment_index_from_positi
 #endif


-s32 func_8002A05C(s32 arg0, s32 arg1, s32* arg2){
+s32 func_8002A05C(s32 arg0, s32 arg1, s32 *arg2){
    s32 i;
    s32 cnt = 0;
    LevelModelSegmentBoundingBox * a0;
@@ -976,7 +976,7 @@ void func_8002ACC8(s32 arg0) {
    D_8011B0F4 = arg0;
 }

-s32 func_8002ACD4(f32* arg0, f32* arg1, f32* arg2) {
+s32 func_8002ACD4(f32 *arg0, f32 *arg1, f32 *arg2) {
    *arg0 = D_8011B0E4;
    *arg1 = D_8011B0E8;
    *arg2 = D_8011B0EC;
@@ -1029,7 +1029,7 @@ void func_8002C71C(LevelModelSegment *segment) {
    segment->unk32 = numVerts;
 }

-LevelModel* func_8002C7C4(void) {
+LevelModel *func_8002C7C4(void) {
    return gCurrentLevelModel;
 }

@@ -1041,11 +1041,11 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_8002CC30.s")

 typedef struct unk8002D30C_a0{
    u8 pad00[0x04];
-    struct unk8002D30C_a0* unk04;
-    struct unk8002D30C_a0* unk08;
+    struct unk8002D30C_a0 *unk04;
+    struct unk8002D30C_a0 *unk08;
 }unk8002D30C_a0;

-void func_8002D30C(unk8002D30C_a0* arg0, s32 arg1) {
+void func_8002D30C(unk8002D30C_a0 *arg0, s32 arg1) {
    // Weird issue here with the ra register.
    while(arg0 != NULL) {
        if(arg0->unk04) {
@@ -121,7 +121,7 @@ s16 D_8011D4E2;

 extern u32 osTvType;

-Settings* get_settings();
+Settings *get_settings();
 Object_64 *func_800BE654(s16, f32, f32);
 void func_80000FDC(s32, s32, f32);
 void func_80009558(s32, f32, f32, f32, s32, s32*);
@@ -195,7 +195,7 @@ typedef struct unk80034530 {
 } unk80034530;

 void func_80034530(Object *arg0, unk80034530 *arg1) {
-    Object_64* temp;
+    Object_64 *temp;
    arg0->unk4C->unk14 = 0x22;
    arg0->unk4C->unk11 = 0;
    temp = arg0->unk64;
@@ -496,7 +496,7 @@ void func_80035F6C(Object *obj, s32 arg1) {
 GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80036040.s")

 void func_80036194(Object *arg0, s32 arg1) {
-    Object_64* temp;
+    Object_64 *temp;
    arg0->unk4C->unk14 = 1;
    arg0->unk4C->unk11 = 0;
    arg0->unk4C->unk10 = 0x1E;
@@ -625,7 +625,7 @@ typedef struct unk80037D08_arg0_64 {

 typedef struct unk80037D08_arg0 {
    u8 pad0[0x64];
-    unk80037D08_arg0_64* unk64;
+    unk80037D08_arg0_64 *unk64;
 } unk80037D08_arg0;

 void func_80037D08(unk80037D08_arg0 *arg0, s32 arg1) {
@@ -815,7 +815,7 @@ void func_800387CC(Object *obj, s32 arg1) {
    obj->unk7C.word = func_8001F460(obj, arg1, obj);
    obj->unk6 |= 0x4000;
    if (obj->unk7C.word == 0 && someObj != NULL) {
-        Object_64_800387CC* someObj64 = someObj->unk64;
+        Object_64_800387CC *someObj64 = someObj->unk64;
        someObj64->unk148 = obj;
    }
 }
@@ -853,7 +853,7 @@ void func_800388D4(Object *arg0, s32 arg1) {
    if (obj4C->unk13 < ((arg0->unk78 >> 16) & 0xFF)) {
        playerObj = obj4C->unk0;
        if (playerObj->descriptor_ptr->unk54 == 1) {
-            Object_64_800388D4* playerObj64 = playerObj->unk64;
+            Object_64_800388D4 *playerObj64 = playerObj->unk64;
            temp_a0 = playerObj64->unk0;
            if ((temp_a0 != -1) && (get_buttons_pressed_from_player(temp_a0) & Z_TRIG)) {
                func_800C31EC(arg0->unk78 & 0xFF, arg0);
@@ -963,7 +963,7 @@ typedef struct Object_3C_80038DC4 {

 void func_80038DC4(Object *arg0, s32 arg1) {
    if (arg0->unk78 != 0) {
-        Object_3C_80038DC4* temp = arg0->unk3C_a.unk3C;
+        Object_3C_80038DC4 *temp = arg0->unk3C_a.unk3C;
        if(arg0->unk4C->unk13 < 0x78) {
            func_8006F338(temp->unk8);
            arg0->unk78 = 0;
@@ -1078,7 +1078,7 @@ void func_800391FC(Object *obj, s32 arg1) {
 }

 void func_800392B8(Object *arg0, s32 arg1) {
-    Object_64* temp;
+    Object_64 *temp;
    arg0->unk4C->unk14 = (u16)1;
    arg0->unk4C->unk11 = (u8)0;
    arg0->unk4C->unk10 = (u8)0x1E;
@@ -1791,7 +1791,7 @@ typedef struct unk80042014_arg0_64 {

 typedef struct unk80042014_arg0 {
    u8 pad0[0x64];
-    unk80042014_arg0_64* unk64;
+    unk80042014_arg0_64 *unk64;
 } unk80042014_arg0;

 typedef struct unk80042014_arg1 {
@@ -1802,7 +1802,7 @@ typedef struct unk80042014_arg1 {
 } unk80042014_arg1;

 void func_80042014(unk80042014_arg0 *arg0, unk80042014_arg1 *arg1) {
-    unk80042014_arg0_64* temp = arg0->unk64;
+    unk80042014_arg0_64 *temp = arg0->unk64;
    temp->unk0 = arg1->unk8;
    temp->unk2 = arg1->unkA;
    temp->unk3 = arg1->unkB;
@@ -1869,7 +1869,7 @@ typedef struct Object_3C_80042178 {

 void func_80042178(Object *obj, s32 arg1) {
    s32 temp;
-    Object_3C_80042178* obj3C;
+    Object_3C_80042178 *obj3C;
    unk80042178 sp20;

    obj3C = obj->unk3C_a.unk3C;
@@ -534,7 +534,7 @@ void func_8005234C(unk8005234C *arg0) {
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052388.s")
 GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005250C.s")

-void func_80052988(Object* arg0, Object_64* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
+void func_80052988(Object *arg0, Object_64 *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
    arg5 *= arg7;

    if ((D_8011D55C == -1) && (arg2 >= 3)) {
@@ -711,7 +711,7 @@ typedef struct unk800570A4_2 {
    s32 unk10;
    s32 unk14;
    u8 unk18[0x4C];
-    unk800570A4* unk64;
+    unk800570A4 *unk64;
 } unk800570A4_2;

 /* Unknown Size */
@@ -1030,7 +1030,7 @@ void func_8003B4BC(s32 arg0);
 void func_8005A3D0(void) {
    s32 i;
    s32 count = 0;
-    u8* temp = (u8*)&func_8003B4BC;
+    u8 *temp = (u8*)&func_8003B4BC;

    for(i = 0; i < D_800DCB50; i++) {
        count += temp[i];
@@ -230,7 +230,7 @@ void func_8006EFDC(void);
 void func_8006A6B0(void) {
    s32 i, count, checksumCount;
    s32 temp;
-    u8* sp44;
+    u8 *sp44;
    sp44 = allocate_from_main_pool_safe(sizeof(LevelHeader), COLOR_TAG_YELLOW);
    gTempAssetTable = load_asset_section_from_rom(ASSET_LEVEL_HEADERS_TABLE);
    for(i = 0; i < 16; i++) {
@@ -371,7 +371,7 @@ s8 func_8006B190(s32 arg0) {
 }

 s32 func_8006B1D4(s32 arg0) {
-    s8* temp;
+    s8 *temp;
    
    if (arg0 < 0 || arg0 >= gNumberOfWorlds) {
        arg0 = 0;
@@ -381,7 +381,7 @@ s32 func_8006B1D4(s32 arg0) {
    return temp[arg0];
 }

-void get_number_of_levels_and_worlds(s32* outLevelCount, s32* outWorldCount) {
+void get_number_of_levels_and_worlds(s32 *outLevelCount, s32 *outWorldCount) {
    *outLevelCount = gNumberOfLevelHeaders;
    *outWorldCount = gNumberOfWorlds;
 }
@@ -662,7 +662,7 @@ u8 get_current_level_race_type(void) {
    return gCurrentLevelHeader->race_type;
 }

-LevelHeader* get_current_level_header(void) {
+LevelHeader *get_current_level_header(void) {
    return gCurrentLevelHeader;
 }

@@ -1784,7 +1784,7 @@ void func_8006E770(Settings *settings, s32 arg1) {
    }
 }

-void func_8006E994(Settings* settings) {
+void func_8006E994(Settings *settings) {
    s32 i;
    s32 sp20;
    s32 sp1C;
@@ -1815,7 +1815,7 @@ void func_8006EA58(void) {
    func_8006E994(gSettingsPtr);
 }

-Settings* get_settings(void) {
+Settings *get_settings(void) {
    return gSettingsPtr;
 }

--- a/Show More
+++ b/Show More