summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-02-18 20:03:17 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-02-18 20:03:17 -0500
commit18f8600ffd714f191bac2061d2e1c3c349c1d6f2 (patch)
treeae23e1611b501e7b7b7b8dd8a5d2514eb77ef911 /src
parentadac76c8370b86176a52d8ecb2e349e2be13f8ba (diff)
Backport sub_8148F3C
Diffstat (limited to 'src')
-rw-r--r--src/scene/intro_credits_graphics.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c
index 6aadafc58..3975fc311 100644
--- a/src/scene/intro_credits_graphics.c
+++ b/src/scene/intro_credits_graphics.c
@@ -438,25 +438,27 @@ u8 sub_8148EC0(u8 a, u16 b, u16 c, u16 d)
void sub_8148F3C(u8 taskId)
{
- s16 r4;
+ s16 data1;
+ s16 data4;
+ s16 data7;
s32 r2;
- r4 = gTasks[taskId].data[1];
- if (r4 != 0)
+ data1 = gTasks[taskId].data[1];
+ if (data1 != 0)
{
r2 = (gTasks[taskId].data[2] << 16) + (u16)gTasks[taskId].data[3];
- r2 -= 16 * (u16)r4;
+ r2 -= 16 * (u16)data1;
gTasks[taskId].data[2] = r2 >> 16;
gTasks[taskId].data[3] = r2;
REG_BG1HOFS = gTasks[taskId].data[2];
REG_BG1VOFS = gUnknown_02039358 + gUnknown_0203935A;
}
- r4 = gTasks[taskId].data[4];
- if (r4 != 0)
+ data4 = gTasks[taskId].data[4];
+ if (data4 != 0)
{
r2 = (gTasks[taskId].data[5] << 16) + (u16)gTasks[taskId].data[6];
- r2 -= 16 * (u16)r4;
+ r2 -= 16 * (u16)data4;
gTasks[taskId].data[5] = r2 >> 16;
gTasks[taskId].data[6] = r2;
REG_BG2HOFS = gTasks[taskId].data[5];
@@ -466,11 +468,11 @@ void sub_8148F3C(u8 taskId)
REG_BG2VOFS = gUnknown_02039358;
}
- r4 = gTasks[taskId].data[7];
- if (r4 != 0)
+ data7 = gTasks[taskId].data[7];
+ if (data7 != 0)
{
r2 = (gTasks[taskId].data[8] << 16) + (u16)gTasks[taskId].data[9];
- r2 -= 16 * (u16)r4;
+ r2 -= 16 * (u16)data7;
gTasks[taskId].data[8] = r2 >> 16;
gTasks[taskId].data[9] = r2;
REG_BG3HOFS = gTasks[taskId].data[8];