mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-04 17:29:55 -04:00
A few matches across a couple files, although mostly code_80005FD0 (#460)
Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
+11
-40
@@ -4783,40 +4783,11 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065AB0.s")
|
||||
#endif
|
||||
|
||||
#ifdef MIPS_TO_C
|
||||
//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
|
||||
? func_800652D4(f32 *, s16 *, f32); /* extern */
|
||||
//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c on Oct-09-2023
|
||||
extern ? D_05FF8DB8;
|
||||
extern u32 D_8018D494;
|
||||
extern u32 D_8018D498;
|
||||
static s32 D_800E47DC[0xC] = {
|
||||
0x00FBFFFB,
|
||||
0x00A06011,
|
||||
0x00E0C090,
|
||||
0x00D0B080,
|
||||
0x00907040,
|
||||
0x00C07010,
|
||||
0x00D0F0FF,
|
||||
0x00E09030,
|
||||
0x00C09030,
|
||||
0x00604020,
|
||||
0x00F0D0B0,
|
||||
0x00A08030,
|
||||
};
|
||||
static s32 D_800E480C[0xC] = {
|
||||
0x00B0B0B0,
|
||||
0x00804011,
|
||||
0x00B08050,
|
||||
0x00A07040,
|
||||
0x00603011,
|
||||
0x00804010,
|
||||
0x007090A0,
|
||||
0x00A06030,
|
||||
0x00A07010,
|
||||
0x00301011,
|
||||
0x00B0A080,
|
||||
0x00806010,
|
||||
};
|
||||
static ? D_800E8C00; /* unable to generate initializer */
|
||||
extern ? D_800E47DC;
|
||||
extern ? D_800E480C;
|
||||
extern ? D_800E8C00;
|
||||
|
||||
void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
|
||||
f32 spE4;
|
||||
@@ -4862,11 +4833,11 @@ void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
|
||||
Gfx *temp_s0_8;
|
||||
Gfx *temp_s0_9;
|
||||
s16 temp_a0;
|
||||
s16 temp_a1;
|
||||
s16 temp_ra;
|
||||
s16 temp_s2;
|
||||
s16 temp_s3;
|
||||
s32 temp_a2;
|
||||
s32 temp_t6;
|
||||
s32 temp_v1;
|
||||
void *temp_v0;
|
||||
|
||||
@@ -4881,11 +4852,11 @@ void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
|
||||
sp44 = temp_v0;
|
||||
func_800652D4(&spDC, &spD4, temp_v0->unk534 * player->size);
|
||||
if ((s32) sp44->unk53C != 8) {
|
||||
temp_a1 = sp44->unk560;
|
||||
temp_a0 = sp44->unk562;
|
||||
temp_v1 = D_800E47DC[temp_a1];
|
||||
temp_t6 = sp44->unk560 * 4;
|
||||
temp_v1 = *(&D_800E47DC + temp_t6);
|
||||
temp_ra = ((temp_v1 >> 0x10) & 0xFF) - temp_a0;
|
||||
temp_a2 = D_800E480C[temp_a1];
|
||||
temp_a2 = *(&D_800E480C + temp_t6);
|
||||
temp_s2 = ((temp_v1 >> 8) & 0xFF) - temp_a0;
|
||||
temp_s3 = (temp_v1 & 0xFF) - temp_a0;
|
||||
spCA = ((temp_a2 >> 0x10) & 0xFF) - temp_a0;
|
||||
@@ -4900,7 +4871,7 @@ void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
|
||||
temp_s0_2 = gDisplayListHead;
|
||||
gDisplayListHead = temp_s0_2 + 8;
|
||||
temp_s0_2->words.w0 = 0xFD900000;
|
||||
temp_s0_2->words.w1 = D_8018D494;
|
||||
temp_s0_2->words.w1 = (u32) D_8018D494;
|
||||
temp_s0_3 = gDisplayListHead;
|
||||
gDisplayListHead = temp_s0_3 + 8;
|
||||
temp_s0_3->words.w1 = 0x07000000;
|
||||
@@ -4938,7 +4909,7 @@ void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
|
||||
temp_s0_11 = gDisplayListHead;
|
||||
gDisplayListHead = temp_s0_11 + 8;
|
||||
temp_s0_11->words.w0 = 0xFD900000;
|
||||
temp_s0_11->words.w1 = D_8018D494;
|
||||
temp_s0_11->words.w1 = (u32) D_8018D494;
|
||||
temp_s0_12 = gDisplayListHead;
|
||||
gDisplayListHead = temp_s0_12 + 8;
|
||||
temp_s0_12->words.w1 = 0x07000000;
|
||||
@@ -4985,7 +4956,7 @@ void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
|
||||
temp_s0_22 = gDisplayListHead;
|
||||
gDisplayListHead = temp_s0_22 + 8;
|
||||
temp_s0_22->words.w0 = 0xFD100000;
|
||||
temp_s0_22->words.w1 = D_8018D498;
|
||||
temp_s0_22->words.w1 = (u32) D_8018D498;
|
||||
temp_s0_23 = gDisplayListHead;
|
||||
gDisplayListHead = temp_s0_23 + 8;
|
||||
temp_s0_23->words.w1 = 0x07080200;
|
||||
|
||||
Reference in New Issue
Block a user