summaryrefslogtreecommitdiff
path: root/src/contest_link_80C2020.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/contest_link_80C2020.c')
-rw-r--r--src/contest_link_80C2020.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/src/contest_link_80C2020.c b/src/contest_link_80C2020.c
index 2dde3895c..8269f424b 100644
--- a/src/contest_link_80C2020.c
+++ b/src/contest_link_80C2020.c
@@ -891,10 +891,10 @@ void sub_80C3158(const u8 *string, u8 spriteId)
sub_80034D4(eContestLink80C2020Struct2018068, gDisplayedStringBattle);
- CpuCopy32(&gUnknown_083D1624[0x0], (void *)0x6010000 + 32 * sp00[0], 32);
- CpuCopy32(&gUnknown_083D1624[0x40], (void *)0x6010000 + 32 * sp00[0] + 0x100, 32);
- CpuCopy32(&gUnknown_083D1624[0x40], (void *)0x6010000 + 32 * sp00[0] + 0x200, 32);
- CpuCopy32(&gUnknown_083D1624[0x20], (void *)0x6010000 + 32 * sp00[0] + 0x300, 32);
+ CpuCopy32(&gUnknown_083D1624[0x0], (void *)(VRAM + 0x10000) + 32 * sp00[0], 32);
+ CpuCopy32(&gUnknown_083D1624[0x40], (void *)(VRAM + 0x10000) + 32 * sp00[0] + 0x100, 32);
+ CpuCopy32(&gUnknown_083D1624[0x40], (void *)(VRAM + 0x10000) + 32 * sp00[0] + 0x200, 32);
+ CpuCopy32(&gUnknown_083D1624[0x20], (void *)(VRAM + 0x10000) + 32 * sp00[0] + 0x300, 32);
w = width / 8;
j = 0;
@@ -1415,27 +1415,27 @@ static inline s32 de_sub_80C39A8(s32 a0)
s32 result = 0;
if (gIsLinkContest & 0x1)
{
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 9, 2, 8, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 9, 2, 8, 2);
result = 8;
}
else if (gSpecialVar_ContestRank == 0)
{
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 0, 0, 9, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 0, 0, 9, 2);
result = 9;
}
else if (gSpecialVar_ContestRank == 1)
{
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 9, 0, 8, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 9, 0, 8, 2);
result = 8;
}
else if (gSpecialVar_ContestRank == 2)
{
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 17, 0, 8, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 17, 0, 8, 2);
result = 8;
}
else
{
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 0, 2, 9, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 0, 2, 9, 2);
result = 9;
}
return result;
@@ -1447,31 +1447,31 @@ static inline s32 de_sub_80C3A84(s32 a0, s32 * a1)
if (gSpecialVar_ContestCategory == 0)
{
*a1 = 0;
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 17, 2, 10, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 17, 2, 10, 2);
result = 10;
}
else if (gSpecialVar_ContestCategory == 1)
{
*a1 = 1;
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 0, 4, 11, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 0, 4, 11, 2);
result = 11;
}
else if (gSpecialVar_ContestCategory == 2)
{
*a1 = 2;
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 11, 4, 10, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 11, 4, 10, 2);
result = 10;
}
else if (gSpecialVar_ContestCategory == 3)
{
*a1 = 3;
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 21, 4, 10, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 21, 4, 10, 2);
result = 10;
}
else
{
*a1 = 4;
- sub_809D104((void *)0x0600E000, a0, 1, gUnknown_08E964B8, 0, 6, 10, 2);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 1, gUnknown_08E964B8, 0, 6, 10, 2);
result = 10;
}
return result;
@@ -1484,8 +1484,8 @@ void sub_80C37E4(void)
de_sub_80C3A84(de_sub_80C39A8(5) + 5, &sp0);
for (i = 0; i < 0x80; i++)
{
- ((vu16 *)0x0600E000)[i] &= 0xFFF;
- ((vu16 *)0x0600E000)[i] |= sp0 << 12;;
+ ((vu16 *)(VRAM + 0xE000))[i] &= 0xFFF;
+ ((vu16 *)(VRAM + 0xE000))[i] |= sp0 << 12;;
}
}
#else
@@ -1707,27 +1707,27 @@ s16 de_sub_80C39A8(s32 a0)
s16 result;
if (gIsLinkContest & 1)
{
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 11, 3, 8, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 11, 3, 8, 3);
result = 8;
}
else if (gSpecialVar_ContestRank == 0)
{
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 0, 0, 11, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 0, 0, 11, 3);
result = 11;
}
else if (gSpecialVar_ContestRank == 1)
{
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 11, 0, 10, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 11, 0, 10, 3);
result = 10;
}
else if (gSpecialVar_ContestRank == 2)
{
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 21, 0, 10, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 21, 0, 10, 3);
result = 10;
}
else
{
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 0, 3, 11, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 0, 3, 11, 3);
result = 11;
}
return result;
@@ -1739,31 +1739,31 @@ s16 de_sub_80C3A84(s32 a0, s32 * a1)
if (gSpecialVar_ContestCategory == 0)
{
*a1 = 0;
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 19, 3, 7, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 19, 3, 7, 3);
result = 7;
}
else if (gSpecialVar_ContestCategory == 1)
{
*a1 = 1;
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 0, 6, 7, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 0, 6, 7, 3);
result = 7;
}
else if (gSpecialVar_ContestCategory == 2)
{
*a1 = 2;
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 7, 6, 4, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 7, 6, 4, 3);
result = 4;
}
else if (gSpecialVar_ContestCategory == 3)
{
*a1 = 3;
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 11, 6, 6, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 11, 6, 6, 3);
result = 6;
}
else
{
*a1 = 4;
- sub_809D104((void *)0x0600E000, a0, 0, gUnknown_08E964B8, 17, 6, 5, 3);
+ sub_809D104((void *)(VRAM + 0xE000), a0, 0, gUnknown_08E964B8, 17, 6, 5, 3);
result = 5;
}
return result;
@@ -1776,8 +1776,8 @@ void sub_80C37E4(void)
de_sub_80C3A84(de_sub_80C39A8(6) + 6, &sp0);
for (i = 0; i < 0x80; i++)
{
- ((vu16 *)0x0600E000)[i] &= 0xFFF;
- ((vu16 *)0x0600E000)[i] |= sp0 << 12;;
+ ((vu16 *)(VRAM + 0xE000))[i] &= 0xFFF;
+ ((vu16 *)(VRAM + 0xE000))[i] |= sp0 << 12;;
}
}
#endif
@@ -1848,10 +1848,10 @@ void sub_80C3A5C(u8 taskId)
if (--gTasks[taskId].data[11] == -1)
{
firstTileNum = gTasks[taskId].data[0] * 2 + 0x5043;
- *(vu16 *)(0x0600E142 + gTasks[taskId].data[1] * 192) = firstTileNum + 0x00;
- *(vu16 *)(0x0600E144 + gTasks[taskId].data[1] * 192) = firstTileNum + 0x01;
- *(vu16 *)(0x0600E182 + gTasks[taskId].data[1] * 192) = firstTileNum + 0x10;
- *(vu16 *)(0x0600E184 + gTasks[taskId].data[1] * 192) = firstTileNum + 0x11;
+ *(vu16 *)((VRAM + 0xE142) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x00;
+ *(vu16 *)((VRAM + 0xE144) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x01;
+ *(vu16 *)((VRAM + 0xE182) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x10;
+ *(vu16 *)((VRAM + 0xE184) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x11;
eContestLink80C2020Struct2018000.unk_05++;
DestroyTask(taskId);
PlaySE(SE_JYUNI);
@@ -1871,8 +1871,8 @@ void sub_80C3B30(u8 taskId)
{
for (k = 0; k < 30; k++)
{
- ((u16 *)(0x0600E100 + 2 * (96 * i + 32 * j)))[k] &= 0x0FFF;
- ((u16 *)(0x0600E100 + 2 * (96 * i + 32 * j)))[k] |= 0x9000;
+ ((u16 *)((VRAM + 0xE100) + 2 * (96 * i + 32 * j)))[k] &= 0x0FFF;
+ ((u16 *)((VRAM + 0xE100) + 2 * (96 * i + 32 * j)))[k] |= 0x9000;
}
}
gTasks[taskId].data[10] = i;
@@ -2182,7 +2182,7 @@ void sub_80C40D4(u8 arg0, u8 arg1)
x += 32 * (i * 3 + 5);
x -= arg1;
x--;
- *(vu16 *)(0x0600C000 + 2 * x) = 0x60B3;
+ *(vu16 *)((VRAM + 0xC000) + 2 * x) = 0x60B3;
taskId = CreateTask(sub_80C42C0, 10);
var0 = ((eContestLink80C2020Struct2018018[i].unk_08 << 16) / eContestLink80C2020Struct2018018[i].unk_11) * (arg1 + 1);
if ((var0 % 0x10000) >= 0x8000)
@@ -2209,7 +2209,7 @@ void sub_80C40D4(u8 arg0, u8 arg1)
x += 32 * (i * 3 + 6);
x -= arg1;
x--;
- *(vu16 *)(0x0600C000 + 2 * x) = tile;
+ *(vu16 *)((VRAM + 0xC000) + 2 * x) = tile;
taskId = CreateTask(sub_80C42C0, 10);
var0 = ((eContestLink80C2020Struct2018018[i].unk_0c << 16) / eContestLink80C2020Struct2018018[i].unk_12) * (arg1 + 1);
if ((var0 % 0x10000) >= 0x8000)
@@ -2551,7 +2551,7 @@ void sub_80C42C0(u8 taskId /*r12*/)
tile = 0x504C + r0;
else
tile = 0x5057 + r0;
- *(vu16 *)(0x0600E18E + 2 * (96 * r5 + i)) = tile;
+ *(vu16 *)((VRAM + 0xE18E) + 2 * (96 * r5 + i)) = tile;
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 00:01:59 +0000