Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2025-02-17 03:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some matching, gitignored n64crc (#23)

Browse Source
This commit is contained in:
Mr-Wiseguy 2020-10-06 11:15:44 -04:00 committed by GitHub
parent b575977d15
commit 75bb1e5ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 54 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,6 +12,7 @@ tools/gfxdis.f3dex2
tools/n64graphics
tools/armips
tools/iplfontutil
tools/n64crc
*.o
__pycache__/*
.vscode/*

10
asm/non_matchings/ovl0/ovl0_4/func_800141D4.s
View File

@ -1,10 +0,0 @@
glabel func_800141D4
/* 014DD4 800141D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 014DD8 800141D8 AFBF0014 */ sw $ra, 0x14($sp)
/* 014DDC 800141DC 3C058005 */ lui $a1, %hi(gDisplayListHeads) # $a1, 0x8005
/* 014DE0 800141E0 0C00503F */ jal func_800140FC
/* 014DE4 800141E4 24A5A3D0 */ addiu $a1, %lo(gDisplayListHeads) # addiu $a1, $a1, -0x5c30
/* 014DE8 800141E8 8FBF0014 */ lw $ra, 0x14($sp)
/* 014DEC 800141EC 27BD0018 */ addiu $sp, $sp, 0x18
/* 014DF0 800141F0 03E00008 */ jr $ra
/* 014DF4 800141F4 00000000 */ nop

10
asm/non_matchings/ovl0/ovl0_4/func_800141F8.s
View File

@ -1,10 +0,0 @@
glabel func_800141F8
/* 014DF8 800141F8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 014DFC 800141FC AFBF0014 */ sw $ra, 0x14($sp)
/* 014E00 80014200 3C058005 */ lui $a1, %hi(gDisplayListHead2) # $a1, 0x8005
/* 014E04 80014204 0C00503F */ jal func_800140FC
/* 014E08 80014208 24A5A3D4 */ addiu $a1, %lo(gDisplayListHead2) # addiu $a1, $a1, -0x5c2c
/* 014E0C 8001420C 8FBF0014 */ lw $ra, 0x14($sp)
/* 014E10 80014210 27BD0018 */ addiu $sp, $sp, 0x18
/* 014E14 80014214 03E00008 */ jr $ra
/* 014E18 80014218 00000000 */ nop

10
asm/non_matchings/ovl0/ovl0_4/func_8001421C.s
View File

@ -1,10 +0,0 @@
glabel func_8001421C
/* 014E1C 8001421C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 014E20 80014220 AFBF0014 */ sw $ra, 0x14($sp)
/* 014E24 80014224 3C058005 */ lui $a1, %hi(gDisplayListHead3) # $a1, 0x8005
/* 014E28 80014228 0C00503F */ jal func_800140FC
/* 014E2C 8001422C 24A5A3D8 */ addiu $a1, %lo(gDisplayListHead3) # addiu $a1, $a1, -0x5c28
/* 014E30 80014230 8FBF0014 */ lw $ra, 0x14($sp)
/* 014E34 80014234 27BD0018 */ addiu $sp, $sp, 0x18
/* 014E38 80014238 03E00008 */ jr $ra
/* 014E3C 8001423C 00000000 */ nop

10
asm/non_matchings/ovl0/ovl0_4/func_80014240.s
View File

@ -1,10 +0,0 @@
glabel func_80014240
/* 014E40 80014240 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 014E44 80014244 AFBF0014 */ sw $ra, 0x14($sp)
/* 014E48 80014248 3C058005 */ lui $a1, %hi(gDisplayListHead4) # $a1, 0x8005
/* 014E4C 8001424C 0C00503F */ jal func_800140FC
/* 014E50 80014250 24A5A3DC */ addiu $a1, %lo(gDisplayListHead4) # addiu $a1, $a1, -0x5c24
/* 014E54 80014254 8FBF0014 */ lw $ra, 0x14($sp)
/* 014E58 80014258 27BD0018 */ addiu $sp, $sp, 0x18
/* 014E5C 8001425C 03E00008 */ jr $ra
/* 014E60 80014260 00000000 */ nop

10
asm/non_matchings/ovl1/ovl1/func_800A043C.s
View File

@ -1,10 +0,0 @@
glabel func_800A043C
/* 04868C 800A043C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 048690 800A0440 AFBF0014 */ sw $ra, 0x14($sp)
/* 048694 800A0444 3C068005 */ lui $a2, %hi(gDisplayListHeads) # $a2, 0x8005
/* 048698 800A0448 0C027A3D */ jal func_8009E8F4_ovl1
/* 04869C 800A044C 24C6A3D0 */ addiu $a2, %lo(gDisplayListHeads) # addiu $a2, $a2, -0x5c30
/* 0486A0 800A0450 8FBF0014 */ lw $ra, 0x14($sp)
/* 0486A4 800A0454 27BD0018 */ addiu $sp, $sp, 0x18
/* 0486A8 800A0458 03E00008 */ jr $ra
/* 0486AC 800A045C 00000000 */ nop

9
asm/non_matchings/ovl1/ovl1/func_800A0460.s
View File

@ -1,9 +0,0 @@
glabel func_800A0460
/* 0486B0 800A0460 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0486B4 800A0464 AFBF0014 */ sw $ra, 0x14($sp)
/* 0486B8 800A0468 0C02810F */ jal func_800A043C_ovl1
/* 0486BC 800A046C 24050003 */ li $a1, 3
/* 0486C0 800A0470 8FBF0014 */ lw $ra, 0x14($sp)
/* 0486C4 800A0474 27BD0018 */ addiu $sp, $sp, 0x18
/* 0486C8 800A0478 03E00008 */ jr $ra
/* 0486CC 800A047C 00000000 */ nop

11
asm/non_matchings/ovl1/ovl1/func_800A0480.s
View File

@ -1,11 +0,0 @@
glabel func_800A0480
/* 0486D0 800A0480 18800006 */ blez $a0, .L800A049C_ovl1
/* 0486D4 800A0484 28810009 */ slti $at, $a0, 9
/* 0486D8 800A0488 10200004 */ beqz $at, .L800A049C_ovl1
/* 0486DC 800A048C 00047080 */ sll $t6, $a0, 2
/* 0486E0 800A0490 3C01800D */ lui $at, %hi(D_800D6A14)
/* 0486E4 800A0494 002E0821 */ addu $at, $at, $t6
/* 0486E8 800A0498 AC256A14 */ sw $a1, %lo(D_800D6A14)($at)
.L800A049C_ovl1:
/* 0486EC 800A049C 03E00008 */ jr $ra
/* 0486F0 800A04A0 00000000 */ nop

6
asm/non_matchings/ovl1/ovl1/func_800A04A4.s
View File

@ -1,6 +0,0 @@
glabel func_800A04A4
/* 0486F4 800A04A4 3C01800C */ lui $at, %hi(D_800BE3E0) # $at, 0x800c
/* 0486F8 800A04A8 A024E3E0 */ sb $a0, %lo(D_800BE3E0)($at)
/* 0486FC 800A04AC 3C01800C */ lui $at, %hi(D_800BE3E4)
/* 048700 800A04B0 03E00008 */ jr $ra
/* 048704 800A04B4 A025E3E4 */ sb $a1, %lo(D_800BE3E4)($at)

31
asm/non_matchings/ovl2_5/func_800FDA40_ovl2.s
View File

@ -1,31 +0,0 @@
glabel func_800FDA40_ovl2
/* 0864B0 800FDA40 44857000 */ mtc1 $a1, $f14
/* 0864B4 800FDA44 44866000 */ mtc1 $a2, $f12
/* 0864B8 800FDA48 3C098005 */ lui $t1, %hi(gDisplayListHeads) # $t1, 0x8005
/* 0864BC 800FDA4C 4600718D */ trunc.w.s $f6, $f14
/* 0864C0 800FDA50 2529A3D0 */ addiu $t1, %lo(gDisplayListHeads) # addiu $t1, $t1, -0x5c30
/* 0864C4 800FDA54 3C190100 */ lui $t9, (0x01004008 >> 16) # lui $t9, 0x100
/* 0864C8 800FDA58 4600610D */ trunc.w.s $f4, $f12
/* 0864CC 800FDA5C 44053000 */ mfc1 $a1, $f6
/* 0864D0 800FDA60 00801025 */ move $v0, $a0
/* 0864D4 800FDA64 37394008 */ ori $t9, (0x01004008 & 0xFFFF) # ori $t9, $t9, 0x4008
/* 0864D8 800FDA68 44032000 */ mfc1 $v1, $f4
/* 0864DC 800FDA6C A4850022 */ sh $a1, 0x22($a0)
/* 0864E0 800FDA70 A4850032 */ sh $a1, 0x32($a0)
/* 0864E4 800FDA74 A4830002 */ sh $v1, 2($a0)
/* 0864E8 800FDA78 A4830012 */ sh $v1, 0x12($a0)
/* 0864EC 800FDA7C 8D270000 */ lw $a3, ($t1)
/* 0864F0 800FDA80 3C0B0604 */ lui $t3, (0x06040602 >> 16) # lui $t3, 0x604
/* 0864F4 800FDA84 356B0602 */ ori $t3, (0x06040602 & 0xFFFF) # ori $t3, $t3, 0x602
/* 0864F8 800FDA88 24F80008 */ addiu $t8, $a3, 8
/* 0864FC 800FDA8C AD380000 */ sw $t8, ($t1)
/* 086500 800FDA90 ACE20004 */ sw $v0, 4($a3)
/* 086504 800FDA94 ACF90000 */ sw $t9, ($a3)
/* 086508 800FDA98 8D270000 */ lw $a3, ($t1)
/* 08650C 800FDA9C 240C0402 */ li $t4, 1026
/* 086510 800FDAA0 24840030 */ addiu $a0, $a0, 0x30
/* 086514 800FDAA4 24EA0008 */ addiu $t2, $a3, 8
/* 086518 800FDAA8 AD2A0000 */ sw $t2, ($t1)
/* 08651C 800FDAAC ACEC0004 */ sw $t4, 4($a3)
/* 086520 800FDAB0 03E00008 */ jr $ra
/* 086524 800FDAB4 ACEB0000 */ sw $t3, ($a3)

40
src/ovl0/ovl0_4.c
View File

@ -1048,41 +1048,23 @@ void func_800140FC(void *arg0, void *arg1) {
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_4/func_800140FC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800141D4(void) {
func_800140FC(&gDisplayListHeads);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_4/func_800141D4.s")
#endif
extern Gfx* gDisplayListHeads[4];
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800141F8(void) {
func_800140FC(&gDisplayListHead2);
void func_800141D4(void* arg0) {
func_800140FC(arg0, &gDisplayListHeads[0]);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_4/func_800141F8.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_8001421C(void) {
func_800140FC(&gDisplayListHead3);
void func_800141F8(void* arg0) {
func_800140FC(arg0, &gDisplayListHeads[1]);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_4/func_8001421C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_80014240(void) {
func_800140FC(&gDisplayListHead4);
void func_8001421C(void* arg0) {
func_800140FC(arg0, &gDisplayListHeads[2]);
}
void func_80014240(void* arg0) {
func_800140FC(arg0, &gDisplayListHeads[3]);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl0/ovl0_4/func_80014240.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6

46
src/ovl1/ovl1.c
View File

@ -872,46 +872,32 @@ the instruction, which has a name starting with "jtbl".
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1/func_8009E8F4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800A043C(void) {
func_8009E8F4_ovl1(gDisplayListHeads);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1/func_800A043C.s")
#endif
extern Gfx* gDisplayListHeads[4];
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800A0460(void) {
func_800A043C_ovl1(3);
void func_800A043C(u32 arg0, u32 arg1) {
func_8009E8F4_ovl1(arg0, arg1, &gDisplayListHeads[0]);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1/func_800A0460.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800A0480(s32 arg0, ?32 arg1) {
void func_800A0460(u32 arg0) {
func_800A043C_ovl1(arg0, 3);
}
extern u32 D_800D6A14[];
void func_800A0480(s32 arg0, u32 arg1) {
if (arg0 > 0) {
if (arg0 < 9) {
*(&D_800D6A14 + (arg0 * 4)) = arg1;
D_800D6A14[arg0] = arg1;
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1/func_800A0480.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800A04A4(s8 arg0, s8 arg1) {
D_800BE3E0 = arg0;
D_800BE3E4 = arg1;
extern s8 D_800BE3E0, D_800BE3E4;
void func_800A04A4(u32 arg0, u32 arg1) {
D_800BE3E0 = arg0 & 0xFF;
D_800BE3E4 = arg1 & 0xFF;
}
#else
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1/func_800A04A4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6

40
src/ovl10/ovl10_1.c
View File

@ -670,35 +670,27 @@ void func_801DDAA0_ovl10(s32 arg0) {
D_800EA520[D_8004A7C4->unk0] = 5;
}
extern s32 D_801F42F0[];
// Mostly regall
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_801DDAC8_ovl10(s32 arg0) {
s32 temp_a1;
s32 temp_a1_2;
struct EntityThing800E9AA0 **temp_a0;
struct EntityThing800E9AA0 **temp_a0_2;
s32 phi_a1;
s32 phi_a1_2;
struct EntityThing800E9AA0 **phi_a0;
s32 randInt;
s32 check;
s32 rand;
temp_a0 = &D_800E9AA0[D_8004A7C4->unk0];
temp_a1 = *(&D_801F42F0_ovl10 + (random_soft_s32_range(6) * 4));
phi_a1 = temp_a1;
phi_a1_2 = temp_a1;
phi_a0 = temp_a0;
if (*temp_a0 == temp_a1) {
loop_1:
temp_a1_2 = *(&D_801F42F0_ovl10 + (random_soft_s32_range(6, phi_a1) * 4));
temp_a0_2 = &D_800E9AA0[D_8004A7C4->unk0];
phi_a1 = temp_a1_2;
phi_a1_2 = temp_a1_2;
phi_a0 = temp_a0_2;
if (*temp_a0_2 == temp_a1_2) {
goto loop_1;
}
randInt = random_soft_s32_range(6);
check = D_800E9AA0[D_8004A7C4->unk0];
rand = D_801F42F0[randInt];
while (check == rand) {
randInt = random_soft_s32_range(6);
rand = D_801F42F0[randInt];
check = D_800E9AA0[D_8004A7C4->unk0];
}
*phi_a0 = phi_a1_2;
D_800DDC50[D_8004A7C4->unk0] = phi_a1_2;
D_800E9AA0[D_8004A7C4->unk0] = rand;
D_800DDC50[D_8004A7C4->unk0] = rand;
}
#else
GLOBAL_ASM("asm/non_matchings/ovl10/ovl10_1/func_801DDAC8_ovl10.s")

34
src/ovl2/ovl2_5.c
View File

@ -2,32 +2,18 @@
#include <macros.h>
extern Gfx *gDisplayListHeads[4];
#ifdef MIPS_TO_C
void func_800FDA40_ovl2(Vtx *vtxList, f32 arg1, f32 arg2) {
Gfx *temp_a3;
Gfx *temp_a3_2;
s32 temp_f4;
s32 temp_f6;
temp_f6 = arg1;
temp_f4 = arg2;
vtxList[2]->v.ob[1] = temp_f6;
vtxList[3]->v.ob[1] = temp_f6;
vtxList[0]->v.ob[1] = temp_f4;
vtxList[1]->v.ob[1] = temp_f4;
temp_a3 = *gDisplayListHeads;
*gDisplayListHeads = temp_a3 + 8;
temp_a3->words.w1 = vtxList;
temp_a3->words.w0 = 0x1004008;
gSPVertex()
temp_a3_2 = *gDisplayListHeads;
*gDisplayListHeads = temp_a3_2 + 8;
temp_a3_2->words.w1 = 0x402;
temp_a3_2->words.w0 = 0x6040602;
void func_800FDA40_ovl2(Vtx *curVtx, f32 arg1, f32 arg2) {
Vtx* vtxList = curVtx;
(curVtx++)->v.ob[1] = arg2;
(curVtx++)->v.ob[1] = arg2;
(curVtx++)->v.ob[1] = arg1;
(curVtx++)->v.ob[1] = arg1;
gSPVertex(gDisplayListHeads[0]++, vtxList, 4, 0);
gSP2Triangles(gDisplayListHeads[0]++, 2, 3, 1, 0x0, 0, 2, 1, 0x0);
}
#else
GLOBAL_ASM("asm/non_matchings/ovl2_5/func_800FDA40_ovl2.s")
#endif
#ifdef MIPS_TO_C
void *func_800FDAB8(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {

BIN
tools/n64crc
View File

Binary file not shown.