ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make it compile

Browse Source
This commit is contained in:
DizzyEggg 2019-03-23 15:46:47 +01:00 committed by huderlem
parent 77c4856e62
commit cbdecf2f8d
2 changed files with 331 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/menu_specialized.c
View File

@ -447,10 +447,46 @@ void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0)
arg0->unk354 = 1; arg0->unk354 = 1;
} }
/* TODO
static void sub_81D2278(struct UnknownStruct_81D1ED4 *arg0, u16 arg1[66][2], struct UnknownSubStruct_81D1ED4 *arg2, struct UnknownSubStruct_81D1ED4 *arg3, u8 arg4, u16 arg5[66][2])
{
s32 var_2C = 0;
u16 r8;
s32 r10, r4, r2, r0, r1, var_30;
if (arg2->unk2 < arg3->unk2)
{
r2 = arg2->unk2;
r10 = arg2->unk2;
r0 = arg3->unk2;
r1 = arg2->unk0;
r4 = r1 << 10;
var_30 = arg3->unk0;
}
else
{
r0 = arg2->unk0;
r10 = arg3->unk2;
r1 = arg3->unk0;
r4 = r1 << 10;
var_30 = arg2->unk0;
r2 = arg3->unk2;
}
r8 = r0 - r2;
if (r8 != 0)
var_2C = ((var_30 - r1) << 10) / r8;
r8++;
if (arg5 == NULL)
{
}
}
*/
NAKED NAKED
static void sub_81D2278(struct UnknownStruct_81D1ED4 *arg0, u16 arg1[66][2], struct UnknownSubStruct_81D1ED4 *arg2, struct UnknownSubStruct_81D1ED4 *arg3, u8 arg4, u16 arg5[66][2]) static void sub_81D2278(struct UnknownStruct_81D1ED4 *arg0, u16 arg1[66][2], struct UnknownSubStruct_81D1ED4 *arg2, struct UnknownSubStruct_81D1ED4 *arg3, u8 arg4, u16 arg5[66][2])
{ {
asm(".syntax unified\n\ asm_unified("\n\
push {r4-r7,lr}\n\ push {r4-r7,lr}\n\
mov r7, r10\n\ mov r7, r10\n\
mov r6, r9\n\ mov r6, r9\n\
@ -742,7 +778,7 @@ _081D2494:\n\
pop {r4-r7}\n\ pop {r4-r7}\n\
pop {r0}\n\ pop {r0}\n\
bx r0\n\ bx r0\n\
.syntax divided"); ");
} }
static void sub_81D24A4(struct UnknownStruct_81D1ED4 *arg0) static void sub_81D24A4(struct UnknownStruct_81D1ED4 *arg0)

4
src/use_pokeblock.c
View File

@ -203,14 +203,14 @@ void sub_8166380(void)
gUnknown_0203BC90->field_50++; gUnknown_0203BC90->field_50++;
break; break;
case 11: case 11:
sub_81D2754(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0]); sub_81D2754(gUnknown_0203BCAC->field_7C58.unk0[0], gUnknown_0203BCAC->field_7C58.unk14[0]);
sub_81D20AC(&gUnknown_0203BCAC->field_7C58); sub_81D20AC(&gUnknown_0203BCAC->field_7C58);
gUnknown_0203BC90->field_50++; gUnknown_0203BC90->field_50++;
break; break;
case 12: case 12:
if (!sub_81D20BC(&gUnknown_0203BCAC->field_7C58)) if (!sub_81D20BC(&gUnknown_0203BCAC->field_7C58))
{ {
sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14, gUnknown_0203BCAC->field_7C58.unk14); sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0], gUnknown_0203BCAC->field_7C58.unk14[0]);
gUnknown_0203BC90->field_50++; gUnknown_0203BC90->field_50++;
} }
break; break;