Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2024-11-27 15:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

both switch cases close to matching

Browse Source
This commit is contained in:
farisawan-2000 2021-01-02 14:46:58 -05:00
parent 5bbb199388
commit 5bb50a23e5
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ovl1/ovl1_1.c
View File

@ -118,6 +118,7 @@ OSThread *func_800A2904(void) {
break;
}
func_80022B88("s: %x\n", D_80048D88);
// add these in when this and the giant switch case function are matching
func_80022B88(&D_800D5B40, D_80048D8C);
func_80022B88(&D_800D5B48, D_80048D90);
return sp1C;
@ -635,6 +636,32 @@ loop_3:
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_1/func_800A36C0.s")
#endif
extern s32 D_800D7288;
extern s32 D_800BE4F0;
extern s32 D_800D6B74;
extern s32 D_800D6B60;
extern u32 D_800D6B68;
extern u32 D_800D6B78;
extern u32 D_800BE500;
extern u32 D_800D6B98;
extern s32 D_800BE504, D_800D6B9C;
extern s32 D_800D6B84;
extern u32 D_800BE530;
extern s32 D_800D6F38, D_800D6F3C;
extern u32 D_800BE51C;
extern u32 D_800BE4FC, D_800BE518;
extern u32 D_800BE534;
extern u32 D_800BE520;
extern u32 D_800BE508, D_800BE50C;
extern u32 D_800BE538;
extern u32 D_800BE53C, D_800BE524;
extern u32 D_800BE510;
extern u32 D_800D6B94;
extern u32 D_800D6B90;
extern s32 D_800D6BA8;
extern u32 D_800D71E8;
#ifdef MIPS_TO_C
//generated by mips_to_c commit e0e006e8858ba357d1dcb4dc64f038b7df278aa6
void func_800A377C(s32 arg0) {
@ -1043,7 +1070,6 @@ block_77:
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_1/func_800A377C.s")
#endif

11
test.c Normal file
View File

@ -0,0 +1,11 @@
840 | D_800BE510 = D_800BE53C;
| ^~~~~~~~~~
859 | temp_v0_2 = D_800D6B94;
| ^~~~~~~~~~
861 | if ((temp_v0_2 == temp_v1) && (D_800D6B90 == (D_800D6B98 + 1))) {
| ^~~~~~~~~~
912 | if (D_800D6BA8 == 0x64) {
| ^~~~~~~~~~
964 | func_80154D60_ovl1(D_800D71E8, 0x15);
| ^~~~~~~~~~