summaryrefslogtreecommitdiff
path: root/src/bard_music.c
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-01-17 14:38:44 +0100
committerMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-01-17 15:00:08 +0100
commit801877553db80267a62c0c3c0b2805b6716d1ef9 (patch)
treefef947af4f6f4ff2cdc6d33e3678e87ecb2e1ae0 /src/bard_music.c
parentc9722602cb47eb5b6ecbccddf13df5f286a8ef7b (diff)
Remove trailing whitespace
Diffstat (limited to 'src/bard_music.c')
-rw-r--r--src/bard_music.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bard_music.c b/src/bard_music.c
index ee70f5319..43c2923d2 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -48,7 +48,7 @@ static s16 sub_814A2B8(u32 arg0, u32 arg1)
struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
{
struct BardSound *sounds = gBardMusicTable[arg0];
-
+
return &sounds[arg1];
}
@@ -57,28 +57,28 @@ s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
s32 i;
s32 j;
s32 thirty;
-
+
for (i = 0; i < 6; i++)
{
dest->var18[i].var00 = src[i].var00;
if (src[i].var00 != 0xFF)
{
s32 r1 = src[i].var01 +gUnknown_084170F4[src[i].var00];
-
+
dest->var18[i].var02 = r1;
dest->var18[i].var06 = src[i].var04;
dest->var04 += r1;
}
}
-
+
for (j = 0, thirty = 30; j < i; j++)
dest->var18[j].var04 = sub_814A2B8(thirty + arg2, j);
-
+
dest->var00++;
dest->var01 = 0;
dest->var02 = 0;
dest->var03 = 0;
dest->var0A = 0;
-
+
//warning: no return statement in function returning non-void
}