Game-Decompilation/Quest
1
0
Fork 0
mirror of https://github.com/Mallos31/Quest.git synced 2025-02-10 15:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

match a few functions and update some syms

Browse Source
This commit is contained in:
Mallos31 2023-04-23 15:53:27 -04:00
parent 63990d839e
commit 7900638988
2 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/15440.c
View File

@ -59,7 +59,30 @@ extern u16 D_8004CD74[];
extern unk15b50s D_80086F18[];
#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_80014840.s")
/*!TODO extremely poor match. Needs work to make sense.*/
#ifdef NON_MATCHING
void func_80014840(void)
{
s16 *new_var2;
s32 new_var3;
unk15b50s *var_v1;
new_var2 = &D_80087170;
var_v1 = D_80086F18; new_var2 = &D_80087170;
new_var3 = 0;
do {
var_v1->unk4 = 0;
var_v1++;
} while (((u32) var_v1) < ((u32) new_var2));
D_80087170 = new_var3;
D_80087188 = 0;
D_800871A0 = 0;
D_800871B8 = 0;
D_80086F10 = 0;
}
#endif
#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_80014890.s")
@ -193,7 +216,20 @@ void func_80017094(s32 arg0, unk18278s* arg1) {
#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_800172A0.s")
#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_8001737C.s")
//#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_8001737C.s")
/*this function has a warning that may be fixed by identifying some struct stuff. !TODO fix the warning.*/
void func_8001737C(s32 arg0, MonsterBattleData* arg1) {
u16* temp_v0;
if (!(gBattleState & 0x100)) {
temp_v0 = arg1->unk68;
*temp_v0 |= 0x40;
func_8001FCF8(arg1, 0x40, 0xB, -1);
return;
}
Setup_MISS_Icon(arg1);
}
//#pragma GLOBAL_ASM("asm/nonmatchings/15440/func_800173E0.s")
void func_800173E0(s32 arg0, unk18278s* arg1) {

36
src/inventory.c
View File

@ -100,40 +100,36 @@ s32 func_80021214(void) {
#pragma GLOBAL_ASM("asm/nonmatchings/inventory/func_80021240.s")
#ifdef NON_MATCHING
s32 func_80021240(u8 param_1)
s32 func_80021240(u8 arg0)
{
u8 *new_var4;
u8 *new_var3;
s32 var_v1 = 0;
u8 temp_t9;
u8 new_var2;
u8 uVar1;
u8 *var_a2;
u8 *new_var;
s32 i;
u8 *temp;
new_var4 = &D_8008CF77;
i = 0;
uVar1 = 0x95;
new_var3 = (new_var = gInventory);
temp = new_var3 + uVar1;
uVar1 = new_var[149];
while (1)
var_a2 = &gInventory[0x95];
var_a2 = &D_8008CF77;
while (var_v1 == 0)
{
uVar1 = *temp;
temp = temp + (-((0, 1)));
if (param_1 == (new_var2 = uVar1))
new_var2 = *var_a2;
temp_t9 = new_var2;
new_var = var_a2;
new_var2 = 0;
var_a2 -= 1;
if (arg0 == temp_t9)
{
i += 1;
var_v1 += 1;
}
if ((new_var4 == temp) || (i != 0))
if (var_a2 == ((new_var2, new_var)))
{
break;
}
}
return i;
return var_v1;
}
#endif
//#pragma GLOBAL_ASM("asm/nonmatchings/inventory/func_800212A0.s")
void func_800212A0(u8 arg0) {
s32 i = 0;