diff options
| author | rozlette <uberpanzermensch@gmail.com> | 2018-11-16 22:14:07 -0600 |
|---|---|---|
| committer | rozlette <uberpanzermensch@gmail.com> | 2018-11-16 22:14:07 -0600 |
| commit | dffd1873049b713938f1dd6cfe6fea823baad3fd (patch) | |
| tree | db0fc876b32ca58f16e871cce486298deffbe0e3 /src/boot | |
| parent | 31342be30b66c49d8459e2180cf18ea76bee67a1 (diff) | |
Use hex instead of decimal
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/boot_0x80080180.c | 32 | ||||
| -rw-r--r-- | src/boot/boot_0x80085320.c | 62 |
2 files changed, 47 insertions, 47 deletions
diff --git a/src/boot/boot_0x80080180.c b/src/boot/boot_0x80080180.c index a6281955b..175e6a8e7 100644 --- a/src/boot/boot_0x80080180.c +++ b/src/boot/boot_0x80080180.c @@ -15,40 +15,40 @@ UNK_RET func_8008019C(void) { } UNK_RET func_800801EC(void) { - UNK_TYPE sp28; - UNK_PTR sp24 = (UNK_PTR)(0x80000000 + osMemSize); + UNK_TYPE sp1C; + UNK_PTR sp18 = (UNK_PTR)(0x80000000 + osMemSize); func_80080150((void*)0x80000400, &D_80000500); func_80080150(&D_80025D00, (int*)func_80080060); - func_80080150(&D_80208EA0, sp24); + func_80080150(&D_80208EA0, sp18); } UNK_RET func_80080250(void) { UNK_TYPE* v0; UNK_PTR v1; UNK_PTR t7; - UNK_TYPE sp88; - UNK_TYPE sp84; - UNK_TYPE sp80; - UNK_TYPE sp76; - UNK_TYPE sp72; - OSMesgQueue sp48; - OSMesg sp44; - UNK_TYPE sp40; + UNK_TYPE sp58; + UNK_TYPE sp54; + UNK_TYPE sp50; + UNK_TYPE sp4C; + UNK_TYPE sp48; + OSMesgQueue sp30; + OSMesg sp2C; + UNK_TYPE sp28; - osCreateMesgQueue(&sp48, &sp44, 1); + osCreateMesgQueue(&sp30, &sp2C, 1); v1 = &D_00B3C000; t7 = &D_00C7A4E0; v0 = &D_80096B50; - sp40 = *v0; + sp28 = *v0; *v0 = 0; - func_80080C04((s80080A08*)&sp72, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp48, 0); + func_80080C04((s80080A08*)&sp48, (UNK_FUN_ARG)func_800A5AC0, v1, (u32)t7 - (u32)v1, 0, &sp30, 0); func_8008019C(); func_800801EC(); - osRecvMesg(&sp48, 0, 1); + osRecvMesg(&sp30, 0, 1); - D_80096B50 = sp40; + D_80096B50 = sp28; func_80080150(&D_801E3FA0, &D_80208EA0); } diff --git a/src/boot/boot_0x80085320.c b/src/boot/boot_0x80085320.c index fe15167f4..191a67cb8 100644 --- a/src/boot/boot_0x80085320.c +++ b/src/boot/boot_0x80085320.c @@ -1,48 +1,48 @@ #include <ultra64.h> #include <global.h> -void func_80085320(struct s80085320* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp16, UNK_PTR sp20) { +void func_80085320(s80085320* a0, UNK_PTR a1, UNK_PTR a2, UNK_TYPE a3, UNK_TYPE sp10, UNK_PTR sp14) { UNK_TYPE* i; - struct s80085320* v0; - + s80085320* v0; + if (a0 == NULL) { g_s80085320_ListHead = NULL; return; } - + a0->unk8 = a1; - a0->unk12 = a2; - a0->unk16 = a3; - a0->unk20 = sp16; - a0->unk24 = sp20; - + a0->unkC = a2; + a0->unk10 = a3; + a0->unk14 = sp10; + a0->unk18 = sp14; + v0 = g_s80085320_ListHead; while (v0 != NULL) { if (v0 == a0) return; v0 = v0->next; } - + a0->prev = g_s80085320_ListTail; a0->next = NULL; - + if (g_s80085320_ListTail != NULL) { g_s80085320_ListTail->next = a0; } - + g_s80085320_ListTail = a0; - + if (g_s80085320_ListHead == NULL) { g_s80085320_ListHead = a0; } - - if (a0->unk20 != -1) { - for (i = a0->unk8; i < a0->unk12; i++) { - *i = a0->unk16; + + if (a0->unk14 != -1) { + for (i = a0->unk8; i < a0->unkC; i++) { + *i = a0->unk10; } } } -UNK_RET func_800853F8(struct s80085320* a0) { +UNK_RET func_800853F8(s80085320* a0) { if (a0->prev == NULL) { if (g_s80085320_ListHead == a0) { g_s80085320_ListHead = a0->next; @@ -50,7 +50,7 @@ UNK_RET func_800853F8(struct s80085320* a0) { } else { a0->prev->next = a0->next; } - + if (a0->next == NULL) { if (g_s80085320_ListTail == a0) { g_s80085320_ListTail = a0->prev; @@ -58,32 +58,32 @@ UNK_RET func_800853F8(struct s80085320* a0) { } } -UNK_TYPE func_80085468(struct s80085320* a0) { +UNK_TYPE func_80085468(s80085320* a0) { UNK_TYPE* v1 = a0->unk8; - UNK_TYPE* a1 = a0->unk12; + UNK_TYPE* a1 = a0->unkC; UNK_TYPE* v0 = v1; u32 x; // ptr_diff - + while (v0 < a1) { - if (*v0++ != a0->unk16) break; + if (*v0++ != a0->unk10) break; a1 = (UNK_TYPE*)((u32)v0 - (u32)v1); } - + x = v0 - v1; - + if (x == 0) { return 2; } - - if ((x < a0->unk20) && (a0->unk20 != -1)) { + + if ((x < a0->unk14) && (a0->unk14 != -1)) { return 1; } - + return 0; } UNK_TYPE func_800854E0(UNK_ARGS) { - struct s80085320* s0 = g_s80085320_ListHead; + s80085320* s0 = g_s80085320_ListHead; UNK_TYPE ret = 0; while (s0 != NULL) { if (func_80085468(s0) != 0) { @@ -91,11 +91,11 @@ UNK_TYPE func_800854E0(UNK_ARGS) { } s0 = s0->next; } - + return ret; } -UNK_RET func_80085538(struct s80085320* a0) { +UNK_RET func_80085538(s80085320* a0) { if (a0 == NULL) { func_800854E0(); } else { |
