summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-13 21:51:56 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-13 21:51:56 -0400
commit134cb1c9ec1d1a3a82a88d5065bf0758f9d906a6 (patch)
treef51e157ebccb4a3e49293f93fc0819cd0a5ec6b3
parent811a2fe138af1d08aa94cecfb0513414f08e3d4d (diff)
Somehow these field labels didn't get updated, not that it matters for matching
-rwxr-xr-xsrc/decoration.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/decoration.c b/src/decoration.c
index 8601cb37c..73a2a6749 100755
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -3945,28 +3945,28 @@ void sub_8101460(u8 taskId)
{
for (i=0; i<ewram_1f000.size; i++)
{
- if (ewram_1f000.items[i] != 0) // This is using the wrong register!
+ if (ewram_1f000.items[i] == 0) // This is using the wrong register!
{
- sub_8101118(ewram_1f000.items[i], gUnknown_020391B4);
- if (sub_8101200(taskId, i, gUnknown_020391B4) == TRUE)
- {
- gUnknown_020391B4[0].decorId = i;
- gUnknown_02039234++;
- break;
- }
+ continue;
+ }
+ sub_8101118(ewram_1f000.items[i], gUnknown_020391B4);
+ if (sub_8101200(taskId, i, gUnknown_020391B4) == TRUE)
+ {
+ gUnknown_020391B4[0].decorId = i;
+ gUnknown_02039234++;
+ break;
}
}
if (gUnknown_02039234 != 0)
{
xOff = ewram_1f000.pos[gUnknown_020391B4[0].decorId] >> 4;
yOff = ewram_1f000.pos[gUnknown_020391B4[0].decorId] & 0xf;
- sub_81013B8(xOff, yOff - gUnknown_020391B4[0].var02 + 1, xOff + gUnknown_020391B4[0].var01 - 1, yOff);
+ sub_81013B8(xOff, yOff - gUnknown_020391B4[0].height + 1, xOff + gUnknown_020391B4[0].width - 1, yOff);
}
}
}
#else
__attribute__((naked))
-
void sub_8101460(u8 taskId)
{
asm(".syntax unified\n"