dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking

Browse Source
This commit is contained in:
PikalaxALT
2020-03-05 14:38:26 -05:00
parent 7f81fdc8df 3d5d298c63
commit 83137b4005
219 changed files with 6271 additions and 9187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dodrio_berry_picking_3.c
+9 -9
View File
@@ -22,7 +22,6 @@ u8 sub_815A5E8(s32 a0)
return 0;
}
struct UnkPacket2
{
u8 id;
@@ -66,11 +65,12 @@ struct UnkPacket2
u8 unkB_6:1;
};
// Yeah not even attempting this lol
#ifdef NONMATCHING
static void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8)
static void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 arg6, u32 arg7, u32 arg8)
{
struct UnkPacket2 packet;
struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14;
struct DodrioSubstruct_31A0_14 * ptr = &arg0->unk14;
packet.id = 2;
packet.unk1_0 = ptr->unkB[0];
@@ -120,7 +120,7 @@ static void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruc
}
#else
NAKED
void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8)
void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 arg6, u32 arg7, u32 arg8)
{
asm_unified(" push {r4-r7,lr}\n\
mov r7, r10\n\
@@ -535,10 +535,10 @@ void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_
}
#endif
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8)
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 *arg6, u32 *arg7, u32 *arg8)
{
struct UnkPacket2 *packet;
struct DodrioSubstruct_31A0_14 *ptr = &arg0->unk14;
struct UnkPacket2 * packet;
struct DodrioSubstruct_31A0_14 * ptr = &arg0->unk14;
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
return 0;
@@ -615,7 +615,7 @@ void sub_815AAD8(u8 arg0)
u32 sub_815AB04(u32 arg0, u8 *arg1)
{
struct UnkPacket3 *packet;
struct UnkPacket3 * packet;
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
return 0;
@@ -646,7 +646,7 @@ void sub_815AB3C(u32 arg0)
u32 sub_815AB60(u32 arg0)
{
struct UnkPacket4 *packet;
struct UnkPacket4 * packet;
if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00)
return 0;