ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Through sub_80DC028, sub_80DC0F4 non-matching.

Browse Source
This commit is contained in:
ultima-soul 2018-12-20 11:39:00 -08:00
parent 76510d58bb
commit f966b65849
2 changed files with 376 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

372
asm/contest.s
View File

@ -5,378 +5,6 @@
.text .text
thumb_func_start sub_80DBFC8
sub_80DBFC8: @ 80DBFC8
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =0x00005011
cmp r0, 0
beq _080DBFE2
ldr r1, =0x00006011
cmp r0, 0x1
beq _080DBFE2
ldr r1, =0x00008011
cmp r0, 0x2
bne _080DBFE2
ldr r1, =0x00007011
_080DBFE2:
adds r0, r1, 0x1
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.pool
thumb_func_end sub_80DBFC8
thumb_func_start sub_80DBFFC
sub_80DBFFC: @ 80DBFFC
push {lr}
lsls r0, 16
asrs r0, 16
movs r1, 0xA
bl __divsi3
lsls r0, 24
lsrs r1, r0, 24
asrs r2, r0, 24
cmp r2, 0x10
ble _080DC016
movs r1, 0x10
b _080DC020
_080DC016:
movs r0, 0x10
negs r0, r0
cmp r2, r0
bge _080DC020
movs r1, 0xF0
_080DC020:
lsls r0, r1, 24
asrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_80DBFFC
thumb_func_start sub_80DC028
sub_80DC028: @ 80DC028
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r5, r0, 0
adds r6, r1, 0
lsls r5, 16
lsrs r5, 16
lsls r6, 16
lsrs r6, 16
lsls r2, 24
lsrs r2, 24
mov r8, r2
ldr r0, =gContestResources
ldr r0, [r0]
ldr r0, [r0, 0x14]
lsls r1, r2, 2
adds r1, r0
ldrb r0, [r1, 0x2]
movs r2, 0x4
orrs r0, r2
strb r0, [r1, 0x2]
ldr r0, =sub_80DC0F4
movs r1, 0x14
bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
lsls r5, 16
asrs r5, 16
adds r0, r5, 0
bl sub_80DBFFC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r6, 16
asrs r6, 16
adds r5, r6
lsls r5, 16
asrs r5, 16
adds r0, r5, 0
bl sub_80DBFFC
lsls r4, 24
asrs r4, 24
subs r0, r4
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
bl sub_80DBFC8
ldr r2, =gTasks
lsls r3, r7, 2
adds r0, r3, r7
lsls r0, 3
adds r1, r0, r2
adds r0, r4, 0
cmp r4, 0
bge _080DC0A0
negs r0, r4
_080DC0A0:
strh r0, [r1, 0x8]
lsls r0, r5, 24
asrs r0, 24
strh r0, [r1, 0xA]
cmp r4, 0
bgt _080DC0B4
cmp r4, 0
bne _080DC0C8
cmp r0, 0
ble _080DC0C8
_080DC0B4:
movs r0, 0x1
strh r0, [r1, 0xC]
b _080DC0D6
.pool
_080DC0C8:
ldr r2, =gTasks
lsls r3, r7, 2
adds r0, r3, r7
lsls r0, 3
adds r0, r2
ldr r1, =0x0000ffff
strh r1, [r0, 0xC]
_080DC0D6:
adds r0, r3, r7
lsls r0, 3
adds r0, r2
mov r1, r8
strh r1, [r0, 0xE]
adds r0, r7, 0
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_80DC028
thumb_func_start sub_80DC0F4
sub_80DC0F4: @ 80DC0F4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x10
lsls r0, 24
lsrs r7, r0, 24
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
adds r4, r0, r1
ldrb r0, [r4, 0xE]
mov r9, r0
ldrh r3, [r4, 0x8]
ldrh r1, [r4, 0xA]
ldrh r0, [r4, 0x1C]
adds r0, 0x1
strh r0, [r4, 0x1C]
lsls r0, 16
asrs r0, 16
cmp r0, 0xE
bgt _080DC126
b _080DC2A8
_080DC126:
movs r0, 0
strh r0, [r4, 0x1C]
ldrh r2, [r4, 0xA]
movs r5, 0xA
ldrsh r0, [r4, r5]
cmp r0, 0
bne _080DC15C
adds r0, r7, 0
bl DestroyTask
ldr r0, =gContestResources
ldr r0, [r0]
ldr r0, [r0, 0x14]
mov r2, r9
lsls r1, r2, 2
adds r1, r0
ldrb r2, [r1, 0x2]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1, 0x2]
b _080DC2A8
.pool
_080DC15C:
cmp r3, 0
bne _080DC1A4
lsls r0, r1, 16
mov r8, r0
cmp r0, 0
bge _080DC17A
mov r0, r9
bl sub_80DBFC8
adds r0, 0x2
lsls r0, 16
lsrs r6, r0, 16
ldrh r0, [r4, 0xA]
adds r0, 0x1
b _080DC188
_080DC17A:
mov r0, r9
bl sub_80DBFC8
lsls r0, 16
lsrs r6, r0, 16
ldrh r0, [r4, 0xA]
subs r0, 0x1
_080DC188:
strh r0, [r4, 0xA]
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
adds r0, r1
ldrh r1, [r0, 0x8]
adds r2, r1, 0x1
strh r2, [r0, 0x8]
lsls r1, 24
lsrs r5, r1, 24
b _080DC210
.pool
_080DC1A4:
movs r3, 0xC
ldrsh r0, [r4, r3]
cmp r0, 0
bge _080DC1DE
lsls r0, r1, 16
mov r8, r0
cmp r0, 0
bge _080DC1CC
ldrh r0, [r4, 0x8]
adds r1, r0, 0x1
strh r1, [r4, 0x8]
lsls r0, 24
lsrs r5, r0, 24
adds r0, r2, 0x1
strh r0, [r4, 0xA]
mov r0, r9
bl sub_80DBFC8
adds r0, 0x2
b _080DC20C
_080DC1CC:
ldrh r0, [r4, 0x8]
subs r0, 0x1
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
subs r0, r2, 0x1
strh r0, [r4, 0xA]
b _080DC210
_080DC1DE:
lsls r0, r1, 16
mov r8, r0
cmp r0, 0
bge _080DC1F8
ldrh r0, [r4, 0x8]
subs r0, 0x1
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
adds r0, r2, 0x1
strh r0, [r4, 0xA]
b _080DC210
_080DC1F8:
ldrh r0, [r4, 0x8]
adds r1, r0, 0x1
strh r1, [r4, 0x8]
lsls r0, 24
lsrs r5, r0, 24
subs r0, r2, 0x1
strh r0, [r4, 0xA]
mov r0, r9
bl sub_80DBFC8
_080DC20C:
lsls r0, 16
lsrs r6, r0, 16
_080DC210:
str r5, [sp, 0xC]
movs r0, 0
mov r10, r0
cmp r5, 0x7
bls _080DC226
movs r2, 0x1
mov r10, r2
adds r0, r5, 0
subs r0, 0x8
lsls r0, 24
lsrs r5, r0, 24
_080DC226:
adds r2, r5, 0
adds r2, 0x16
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_02039F26
add r0, r9
ldrb r0, [r0]
lsls r3, r0, 2
adds r3, r0
adds r3, 0x2
add r3, r10
lsls r3, 24
lsrs r3, 24
movs r0, 0x1
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0x11
str r0, [sp, 0x8]
movs r0, 0
adds r1, r6, 0
bl ContestBG_FillBoxWithTile
mov r3, r8
cmp r3, 0
ble _080DC284
movs r0, 0x60
bl PlaySE
ldr r4, =gMPlayInfo_SE1
adds r0, r4, 0
bl m4aMPlayImmInit
ldr r1, =0x0000ffff
ldr r0, [sp, 0xC]
lsls r2, r0, 24
asrs r2, 16
adds r0, r4, 0
bl m4aMPlayPitchControl
b _080DC28A
.pool
_080DC284:
movs r0, 0x16
bl PlaySE
_080DC28A:
mov r2, r10
cmp r2, 0
bne _080DC2A8
cmp r5, 0
bne _080DC2A8
cmp r6, 0
bne _080DC2A8
ldr r0, =gTasks
lsls r1, r7, 2
adds r1, r7
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0xC]
negs r0, r0
strh r0, [r1, 0xC]
_080DC2A8:
add sp, 0x10
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80DC0F4
thumb_func_start sub_80DC2BC thumb_func_start sub_80DC2BC
sub_80DC2BC: @ 80DC2BC sub_80DC2BC: @ 80DC2BC
push {r4,r5,lr} push {r4,r5,lr}

383
src/contest.c
View File

@ -153,7 +153,7 @@ void sub_80DE12C(void);
void sub_80DD45C(u8, u8); void sub_80DD45C(u8, u8);
void sub_80DD720(u8); void sub_80DD720(u8);
void sub_80DE008(bool8); void sub_80DE008(bool8);
void sub_80DC028(s16, s16, u8); u8 sub_80DC028(s16, s16, u8);
bool8 sub_80DB5B8(u8, u8); bool8 sub_80DB5B8(u8, u8);
bool8 sub_80DB798(u8); bool8 sub_80DB798(u8);
void sub_80DB884(void); void sub_80DB884(void);
@ -173,6 +173,7 @@ void Contest_PrintTextToBg0WindowStd(u8, const u8 *);
s16 sub_80DBD34(u8); s16 sub_80DBD34(u8);
void DetermineFinalStandings(void); void DetermineFinalStandings(void);
bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *); bool8 sub_80DBF30(s32, s32, struct UnknownContestStruct6 *);
void sub_80DC0F4(u8);
EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; EWRAM_DATA struct ContestPokemon gContestMons[4] = {0};
EWRAM_DATA s16 gContestMonConditions[4] = {0}; EWRAM_DATA s16 gContestMonConditions[4] = {0};
@ -3034,11 +3035,379 @@ void sub_80DBF68(void)
void sub_80DBF90(void) void sub_80DBF90(void)
{ {
u16 temp = BGCNT_WRAP; int i;
s32 i;
for(i = 3; i >= 0; i--) for(i = 0; i < 4; i++)
{ {
ContestBG_FillBoxWithIncrementingTile(0, temp, 0, 0x16, 0, 0, 0, 0); ContestBG_FillBoxWithTile(0, 0, 0x16, 2 + i * 5, 8, 2, 0x11);
} }
} }
u16 sub_80DBFC8(u8 a)
{
u16 var;
if (a == 0)
var = 0x5011;
else if (a == 1)
var = 0x6011;
else if (a == 2)
var = 0x7011;
else
var = 0x8011;
return var + 1;
}
s8 sub_80DBFFC(s16 a)
{
s8 retVal = a / 10;
if (retVal > 16)
retVal = 16;
else if (retVal < -16)
retVal = -16;
return retVal;
}
u8 sub_80DC028(s16 a, s16 b, u8 c)
{
u8 taskId;
s8 r4;
s8 r5;
gContestResources->field_14[c].unk2_2 = 1;
taskId = CreateTask(sub_80DC0F4, 20);
r4 = sub_80DBFFC(a);
r5 = sub_80DBFFC(a + b) - r4;
sub_80DBFC8(c); // unused return value
gTasks[taskId].data[0] = abs(r4);
gTasks[taskId].data[1] = r5;
if (r4 > 0 || (r4 == 0 && r5 > 0))
gTasks[taskId].data[2] = 1;
else
gTasks[taskId].data[2] = -1;
gTasks[taskId].data[3] = c;
return taskId;
}
#ifdef NONMATCHING
void sub_80DC0F4(u8 taskId)
{
u8 r7 = gTasks[taskId].data[3];
s16 r3 = gTasks[taskId].data[0];
s16 r1 = gTasks[taskId].data[1];
if (++gTasks[taskId].data[10] > 14)
{
u16 r6;
u8 r5;
u8 r10;
gTasks[taskId].data[10] = 0;
if (gTasks[taskId].data[1] == 0)
{
DestroyTask(taskId);
gContestResources->field_14[r7].unk2_2 = 0;
return;
}
else if (r3 == 0)
{
if (r1 < 0)
{
r6 = sub_80DBFC8(r7) + 2;
gTasks[taskId].data[1]++;
}
else
{
r6 = sub_80DBFC8(r7);
gTasks[taskId].data[1]--;
}
r5 = gTasks[taskId].data[0]++;
}
else
{
if (gTasks[taskId].data[2] < 0)
{
if (r1 < 0)
{
r5 = gTasks[taskId].data[0]++;
gTasks[taskId].data[1]++;
r6 = sub_80DBFC8(r7) + 2;
}
else
{
r5 = --gTasks[taskId].data[0];
r6 = 0;
gTasks[taskId].data[1]--;
}
}
else
{
if (r1 < 0)
{
r5 = --gTasks[taskId].data[0];
r6 = 0;
gTasks[taskId].data[1]++;
}
else
{
r5 = gTasks[taskId].data[0]++;
gTasks[taskId].data[1]--;
r6 = sub_80DBFC8(r7);
}
}
}
r10 = r5;
r1 = 0;
if (r5 > 7)
{
r1 = 1;
r5 -= 8;
}
ContestBG_FillBoxWithTile(0, r6, r5 + 0x16, (gUnknown_02039F26[r7] * 5) + 2 + r3, 1, 1, 0x11);
if (r1 > 0)
{
PlaySE(SE_C_GAJI);
m4aMPlayImmInit(&gMPlayInfo_SE1);
m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256);
}
else
{
PlaySE(SE_BOO);
}
if (r10 == 0 && r5 == 0 && r6 == 0)
gTasks[taskId].data[2] = -gTasks[taskId].data[2];
}
}
#else
NAKED
void sub_80DC0F4(u8 taskId)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
mov r7, r10\n\
mov r6, r9\n\
mov r5, r8\n\
push {r5-r7}\n\
sub sp, 0x10\n\
lsls r0, 24\n\
lsrs r7, r0, 24\n\
ldr r1, =gTasks\n\
lsls r0, r7, 2\n\
adds r0, r7\n\
lsls r0, 3\n\
adds r4, r0, r1\n\
ldrb r0, [r4, 0xE]\n\
mov r9, r0\n\
ldrh r3, [r4, 0x8]\n\
ldrh r1, [r4, 0xA]\n\
ldrh r0, [r4, 0x1C]\n\
adds r0, 0x1\n\
strh r0, [r4, 0x1C]\n\
lsls r0, 16\n\
asrs r0, 16\n\
cmp r0, 0xE\n\
bgt _080DC126\n\
b _080DC2A8\n\
_080DC126:\n\
movs r0, 0\n\
strh r0, [r4, 0x1C]\n\
ldrh r2, [r4, 0xA]\n\
movs r5, 0xA\n\
ldrsh r0, [r4, r5]\n\
cmp r0, 0\n\
bne _080DC15C\n\
adds r0, r7, 0\n\
bl DestroyTask\n\
ldr r0, =gContestResources\n\
ldr r0, [r0]\n\
ldr r0, [r0, 0x14]\n\
mov r2, r9\n\
lsls r1, r2, 2\n\
adds r1, r0\n\
ldrb r2, [r1, 0x2]\n\
movs r0, 0x5\n\
negs r0, r0\n\
ands r0, r2\n\
strb r0, [r1, 0x2]\n\
b _080DC2A8\n\
.pool\n\
_080DC15C:\n\
cmp r3, 0\n\
bne _080DC1A4\n\
lsls r0, r1, 16\n\
mov r8, r0\n\
cmp r0, 0\n\
bge _080DC17A\n\
mov r0, r9\n\
bl sub_80DBFC8\n\
adds r0, 0x2\n\
lsls r0, 16\n\
lsrs r6, r0, 16\n\
ldrh r0, [r4, 0xA]\n\
adds r0, 0x1\n\
b _080DC188\n\
_080DC17A:\n\
mov r0, r9\n\
bl sub_80DBFC8\n\
lsls r0, 16\n\
lsrs r6, r0, 16\n\
ldrh r0, [r4, 0xA]\n\
subs r0, 0x1\n\
_080DC188:\n\
strh r0, [r4, 0xA]\n\
ldr r1, =gTasks\n\
lsls r0, r7, 2\n\
adds r0, r7\n\
lsls r0, 3\n\
adds r0, r1\n\
ldrh r1, [r0, 0x8]\n\
adds r2, r1, 0x1\n\
strh r2, [r0, 0x8]\n\
lsls r1, 24\n\
lsrs r5, r1, 24\n\
b _080DC210\n\
.pool\n\
_080DC1A4:\n\
movs r3, 0xC\n\
ldrsh r0, [r4, r3]\n\
cmp r0, 0\n\
bge _080DC1DE\n\
lsls r0, r1, 16\n\
mov r8, r0\n\
cmp r0, 0\n\
bge _080DC1CC\n\
ldrh r0, [r4, 0x8]\n\
adds r1, r0, 0x1\n\
strh r1, [r4, 0x8]\n\
lsls r0, 24\n\
lsrs r5, r0, 24\n\
adds r0, r2, 0x1\n\
strh r0, [r4, 0xA]\n\
mov r0, r9\n\
bl sub_80DBFC8\n\
adds r0, 0x2\n\
b _080DC20C\n\
_080DC1CC:\n\
ldrh r0, [r4, 0x8]\n\
subs r0, 0x1\n\
strh r0, [r4, 0x8]\n\
lsls r0, 24\n\
lsrs r5, r0, 24\n\
movs r6, 0\n\
subs r0, r2, 0x1\n\
strh r0, [r4, 0xA]\n\
b _080DC210\n\
_080DC1DE:\n\
lsls r0, r1, 16\n\
mov r8, r0\n\
cmp r0, 0\n\
bge _080DC1F8\n\
ldrh r0, [r4, 0x8]\n\
subs r0, 0x1\n\
strh r0, [r4, 0x8]\n\
lsls r0, 24\n\
lsrs r5, r0, 24\n\
movs r6, 0\n\
adds r0, r2, 0x1\n\
strh r0, [r4, 0xA]\n\
b _080DC210\n\
_080DC1F8:\n\
ldrh r0, [r4, 0x8]\n\
adds r1, r0, 0x1\n\
strh r1, [r4, 0x8]\n\
lsls r0, 24\n\
lsrs r5, r0, 24\n\
subs r0, r2, 0x1\n\
strh r0, [r4, 0xA]\n\
mov r0, r9\n\
bl sub_80DBFC8\n\
_080DC20C:\n\
lsls r0, 16\n\
lsrs r6, r0, 16\n\
_080DC210:\n\
str r5, [sp, 0xC]\n\
movs r0, 0\n\
mov r10, r0\n\
cmp r5, 0x7\n\
bls _080DC226\n\
movs r2, 0x1\n\
mov r10, r2\n\
adds r0, r5, 0\n\
subs r0, 0x8\n\
lsls r0, 24\n\
lsrs r5, r0, 24\n\
_080DC226:\n\
adds r2, r5, 0\n\
adds r2, 0x16\n\
lsls r2, 24\n\
lsrs r2, 24\n\
ldr r0, =gUnknown_02039F26\n\
add r0, r9\n\
ldrb r0, [r0]\n\
lsls r3, r0, 2\n\
adds r3, r0\n\
adds r3, 0x2\n\
add r3, r10\n\
lsls r3, 24\n\
lsrs r3, 24\n\
movs r0, 0x1\n\
str r0, [sp]\n\
str r0, [sp, 0x4]\n\
movs r0, 0x11\n\
str r0, [sp, 0x8]\n\
movs r0, 0\n\
adds r1, r6, 0\n\
bl ContestBG_FillBoxWithTile\n\
mov r3, r8\n\
cmp r3, 0\n\
ble _080DC284\n\
movs r0, 0x60\n\
bl PlaySE\n\
ldr r4, =gMPlayInfo_SE1\n\
adds r0, r4, 0\n\
bl m4aMPlayImmInit\n\
ldr r1, =0x0000ffff\n\
ldr r0, [sp, 0xC]\n\
lsls r2, r0, 24\n\
asrs r2, 16\n\
adds r0, r4, 0\n\
bl m4aMPlayPitchControl\n\
b _080DC28A\n\
.pool\n\
_080DC284:\n\
movs r0, 0x16\n\
bl PlaySE\n\
_080DC28A:\n\
mov r2, r10\n\
cmp r2, 0\n\
bne _080DC2A8\n\
cmp r5, 0\n\
bne _080DC2A8\n\
cmp r6, 0\n\
bne _080DC2A8\n\
ldr r0, =gTasks\n\
lsls r1, r7, 2\n\
adds r1, r7\n\
lsls r1, 3\n\
adds r1, r0\n\
ldrh r0, [r1, 0xC]\n\
negs r0, r0\n\
strh r0, [r1, 0xC]\n\
_080DC2A8:\n\
add sp, 0x10\n\
pop {r3-r5}\n\
mov r8, r3\n\
mov r9, r4\n\
mov r10, r5\n\
pop {r4-r7}\n\
pop {r0}\n\
bx r0\n\
.pool\n\
.syntax divided\n");
}
#endif