Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start Matching Remaining Functions #111

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Start Matching Remaining Functions #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4a3e4f
fix asmdiff directory
Kurausukun Oct 26, 2023
4045bb1
start matching functions
Kurausukun Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/overlay098/ov98_022499C8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "strbuf.h"

void ov98_022499C8(Strbuf *param0, char * param1, int param2);
void ov98_02249A80(void);
void ov98_02249ACC(void);
int ov98_02249A80(Strbuf *param0, int param1);
void ov98_02249ACC(const char * param0, u32 * param1, int param2);

#endif // POKEPLATINUM_OV98_022499C8_H
4 changes: 2 additions & 2 deletions include/overlay104/ov104_02231F74.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void ov104_022330FC(UnkStruct_ov104_0222E930 * param0, u16 * param1);
void ov104_0223310C(UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2);
void ov104_0223319C(SysTask * param0, void * param1);
void ov104_022331E8(SysTask * param0, void * param1);
void ov104_0223327C(void);
void ov104_02233298(void);
void ov104_0223327C(UnkStruct_ov104_02232B5C * param0, int param1);
void ov104_02233298(UnkStruct_ov104_02232B5C * param0, int param1);

#endif // POKEPLATINUM_OV104_02231F74_H
94 changes: 32 additions & 62 deletions src/overlay005/ov5_021F6454.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,71 +1104,41 @@ BOOL ov5_021F76D0 (UnkStruct_0203E724 * param0)
return 0;
}

asm BOOL ov5_021F7704 (UnkStruct_0203E724 * param0)
{
push {r4, lr}
add r0, #0x80
ldr r0, [r0, #0]
mov r1, #0xf
ldr r0, [r0, #0x38]
bl sub_0206251C
add r4, r0, #0
beq _021F774E
bl sub_02063020
cmp r0, #0x28
bgt _021F7730
cmp r0, #0x26
blt _021F772A
beq _021F773A
cmp r0, #0x28
beq _021F773E
b _021F7746
_021F772A:
cmp r0, #0x1c
beq _021F7736
b _021F7746
_021F7730:
cmp r0, #0x30
beq _021F7742
b _021F7746
_021F7736:
mov r1, #6
b _021F7748
_021F773A:
mov r1, #5
b _021F7748
_021F773E:
mov r1, #3
b _021F7748
_021F7742:
mov r1, #2
b _021F7748
_021F7746:
mov r1, #4
_021F7748:
add r0, r4, #0
bl ov5_021F7654
_021F774E:
mov r0, #0
pop {r4, pc}
BOOL ov5_021F7704 (UnkStruct_0203E724 * param0)
{
int v0;
UnkStruct_02061AB4 * v1 = sub_0206251C(param0->unk_34->unk_38, 15);
if (v1 != NULL)
{
switch (sub_02063020(v1))
{
case 28:
v0 = 6;
break;
case 38:
v0 = 5;
break;
case 40:
v0 = 3;
break;
case 48:
v0 = 2;
break;
default:
v0 = 4;
break;
}
ov5_021F7654(v1, v0);
}
return 0;
}

asm BOOL ov5_021F7754 (UnkStruct_0203E724 * param0)
BOOL ov5_021F7754 (UnkStruct_0203E724 * param0)
{
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0]
mov r1, #0xf
ldr r0, [r0, #0x38]
bl sub_0206251C
cmp r0, #0
beq _021F776E
mov r1, #2
lsl r1, r1, #0xc
bl sub_020628C4
_021F776E:
mov r0, #0
pop {r3, pc}
UnkStruct_02061AB4 * v0 = sub_0206251C(param0->unk_34->unk_38, 15);
if (v0 != NULL)
sub_020628C4(v0, 8192);
return 0;
}

BOOL ov5_021F7774 (UnkStruct_0203E724 * param0)
Expand Down
34 changes: 7 additions & 27 deletions src/overlay005/ov5_021F77A8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,34 +653,14 @@ static const UnkStruct_ov5_02200CE4 Unk_ov5_02200CE4[] = {
{0xFD, 0x0, 0x0, 0x6, 0x2, 0x2}
};

asm BOOL ov5_021F77A8 (UnkStruct_0203E724 * param0)
BOOL ov5_021F77A8 (UnkStruct_0203E724 * param0)
{
push {r4, r5, r6, lr}
add r5, r0, #0
bl sub_0203E838
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0, #0]
bl sub_0203F150
add r6, r0, #0
add r0, r5, #0
bl sub_0203E838
add r1, r0, #0
add r0, r5, #0
add r0, #0x80
ldr r0, [r0, #0]
bl sub_0203F118
add r5, #0x80
add r4, r0, #0
ldr r0, [r5, #0]
ldr r0, [r0, #0xc]
bl sub_02027560
add r1, r6, #0
bl sub_02026FE8
strh r0, [r4]
mov r0, #0
pop {r4, r5, r6, pc}
u16 v0 = sub_0203F150(param0->unk_34, sub_0203E838(param0));
u16 * v1 = sub_0203F118(param0->unk_34, sub_0203E838(param0));
UnkStruct_02026324 * v2 = sub_02027560(param0->unk_34->unk_0C);

*v1 = sub_02026FE8(v2, v0);
return 0;
}

BOOL ov5_021F77E8 (UnkStruct_0203E724 * param0)
Expand Down
Loading
Loading