dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Make changes

Browse Source
This commit is contained in:
ultima-soul
2019-01-27 20:21:30 -08:00
parent b8ff71e65e
commit f828823bf0
1 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contest.c
+14 -48
View File
@@ -3045,7 +3045,7 @@ void sub_80DBED4(void)
if ((gIsLinkContest & 1)) if ((gIsLinkContest & 1))
{ {
gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] = gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] =
((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 0x270F) ? 0x270F : ((gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1) > 9999) ? 9999 :
(gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1); (gSaveBlock2Ptr->contestLinkResults[gSpecialVar_ContestCategory][gContestFinalStandings[gContestPlayerMonIndex]] + 1);
} }
@@ -3218,7 +3218,9 @@ void sub_80DC0F4(u8 taskId)
m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256); m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256);
} }
else else
{
PlaySE(SE_BOO); PlaySE(SE_BOO);
}
if (!r11 && !r5 && !r6) if (!r11 && !r5 && !r6)
gTasks[taskId].data[2] = -gTasks[taskId].data[2]; gTasks[taskId].data[2] = -gTasks[taskId].data[2];
@@ -3328,10 +3330,7 @@ void sub_80DC4F0(void)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]); LoadCompressedSpriteSheet(&gUnknown_08587AE8[i]);
gContestResources->field_14[i].unk1 = CreateSprite( gContestResources->field_14[i].unk1 = CreateSprite(&gSpriteTemplate_8587B18[i], 204, gUnknown_08587A70[gUnknown_02039F26[i]], 0);
&gSpriteTemplate_8587B18[i],
204, gUnknown_08587A70[gUnknown_02039F26[i]],
0);
SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80); SetSubspriteTables(&gSprites[gContestResources->field_14[i].unk1], gSubspriteTables_8587B80);
gSprites[gContestResources->field_14[i].unk1].invisible = TRUE; gSprites[gContestResources->field_14[i].unk1].invisible = TRUE;
} }
@@ -3444,18 +3443,9 @@ void sub_80DC87C(u8 a)
sub_80DC81C(a); sub_80DC81C(a);
r0 = a + 5; r0 = a + 5;
DmaCopy16Defvars( DmaCopy16Defvars(3, gPlttBufferUnfaded + r0 * 16 + 10, gPlttBufferFaded + r0 * 16 + 10, 2);
3,
gPlttBufferUnfaded + r0 * 16 + 10,
gPlttBufferFaded + r0 * 16 + 10,
2);
var = (a + 5) * 16 + 12 + a; var = (a + 5) * 16 + 12 + a;
DmaCopy16Defvars( DmaCopy16Defvars(3, gPlttBufferUnfaded + var, gPlttBufferFaded + var, 2);
3,
gPlttBufferUnfaded + var,
gPlttBufferFaded + var,
2);
} }
void sub_80DC8D0(u8 taskId) void sub_80DC8D0(u8 taskId)
@@ -3718,8 +3708,8 @@ void sub_80DCB78(u8 spriteId)
void sub_80DCBB4(void) void sub_80DCBB4(void)
{ {
SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); SetGpuReg(REG_OFFSET_BLDCNT, BLDALPHA_BLEND(BLDCNT_EFFECT_BLEND, BLDCNT_TGT1_ALL));
SetGpuReg(REG_OFFSET_BLDALPHA, 0x0907); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1| BLDCNT_TGT1_BG2, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG3));
} }
void sub_80DCBD0(void) void sub_80DCBD0(void)
@@ -3780,7 +3770,9 @@ void sub_80DCD08(void)
sub_80DB2BC(); sub_80DB2BC();
} }
else else
{
sub_80DCD48(); sub_80DCD48();
}
} }
#ifdef NONMATCHING #ifdef NONMATCHING
@@ -4781,8 +4773,8 @@ void sub_80DD940(void)
src = gContestApplauseMeterGfx + 64; src = gContestApplauseMeterGfx + 64;
else else
src = gContestApplauseMeterGfx; src = gContestApplauseMeterGfx;
CpuSet(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 0x04000008); CpuCopy32(src, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 17 + i) * 32), 32);
CpuSet(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 0x04000008); CpuCopy32(src + 32, (void *)(VRAM + 0x10000 + (gSprites[sContest.applauseMeterSpriteId].oam.tileNum + 25 + i) * 32), 32);
if (sContest.applauseLevel > 4) if (sContest.applauseLevel > 4)
sub_80DDA20(); sub_80DDA20();
@@ -5031,10 +5023,7 @@ void sub_80DE008(bool8 a)
{ {
if (sContestantStatus[i].turnOrderMod != 0 && a) if (sContestantStatus[i].turnOrderMod != 0 && a)
{ {
CpuSet( CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32), 32);
GetTurnOrderNumberGfx(i),
(void *)(VRAM + 0x10000 + (gSprites[gContestResources->field_14[i].unk1].oam.tileNum + 6) * 32),
0x04000008);
gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]]; gSprites[gContestResources->field_14[i].unk1].pos1.y = gUnknown_08587A70[gUnknown_02039F26[i]];
gSprites[gContestResources->field_14[i].unk1].invisible = FALSE; gSprites[gContestResources->field_14[i].unk1].invisible = FALSE;
} }
@@ -6167,27 +6156,4 @@ void ClearContestWinnerPicsInContestHall(void)
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i]; gSaveBlock1Ptr->contestWinners[i] = gUnknown_08587FA4[i];
} }