summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pokemon/pokemon_data.c12
-rw-r--r--src/roulette_util.c162
2 files changed, 62 insertions, 112 deletions
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
deleted file mode 100644
index 3473b58c8..000000000
--- a/src/pokemon/pokemon_data.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "global.h"
-#include "pokemon.h"
-#include "constants/species.h"
-#include "trainer.h"
-#include "constants/abilities.h"
-#include "constants/moves.h"
-#include "constants/hold_effects.h"
-#include "constants/items.h"
-#include "sprite.h"
-#include "data2.h"
-
-
diff --git a/src/roulette_util.c b/src/roulette_util.c
index 3d5b03a5c..f3eae5518 100644
--- a/src/roulette_util.c
+++ b/src/roulette_util.c
@@ -13,12 +13,12 @@ void sub_8124918(struct UnkStruct0 *r0)
{
r0->var00 = 0;
r0->var02 = 0;
- memset((&r0->var04), 0, 0xC0);
+ memset(&r0->var04, 0, sizeof(r0->var04));
}
u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2)
{
- if (!(r1 < 0x10) || (r0->var04[r1].var00_7))
+ if (!(r1 < 16) || (r0->var04[r1].var00_7))
return 0xFF;
r0->var04[r1].var04.var00 = r2->var00;
@@ -29,123 +29,82 @@ u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2)
r0->var04[r1].var04.var07_0 = r2->var07_0;
r0->var04[r1].var04.var07_5 = r2->var07_5;
r0->var04[r1].var04.var07_7 = r2->var07_7;
-
-
- r0->var04[r1].var00_0 = 0x0;
- r0->var04[r1].var00_7 = 0x1;
-
- r0->var04[r1].var02 = 0x0;
- r0->var04[r1].var01 = 0x0;
+ r0->var04[r1].var00_0 = 0;
+ r0->var04[r1].var00_7 = 1;
+ r0->var04[r1].var02 = 0;
+ r0->var04[r1].var01 = 0;
if (r0->var04[r1].var04.var07_7 < 0)
r0->var04[r1].var03 = 0xFF;
else
- r0->var04[r1].var03 = 0x1;
+ r0->var04[r1].var03 = 1;
return r1;
}
-#ifdef NONMATCHING
u8 unref_sub_81249B0(struct UnkStruct0 *r0, u8 r1)
{
- if (r1 < 0x10)
- {
- if (r0->var04[r1].var00_7)
- {
- r0->var04[r1] = (struct UnkStruct3){0};
- return r1;
- }
- }
- return 0xFF;
-}
-#else
-__attribute__((naked))
-u8 unref_sub_81249B0(struct UnkStruct0 *r0 , u8 r1)
-{
- asm(".syntax unified\n\
- push {r4,lr}\n\
- adds r2, r0, 0\n\
- lsls r1, 24\n\
- lsrs r1, 24\n\
- adds r4, r1, 0\n\
- cmp r4, 0xF\n\
- bhi _081249DC\n\
- lsls r0, r4, 1\n\
- adds r0, r4\n\
- lsls r0, 2\n\
- adds r1, r2, r0\n\
- ldrb r0, [r1, 0x4]\n\
- lsrs r0, 7\n\
- cmp r0, 0\n\
- beq _081249DC\n\
- adds r0, r1, 0x4\n\
- movs r1, 0\n\
- movs r2, 0xC\n\
- bl memset\n\
- adds r0, r4, 0\n\
- b _081249DE\n\
- _081249DC:\n\
- movs r0, 0xFF\n\
- _081249DE:\n\
- pop {r4}\n\
- pop {r1}\n\
- bx r1\n\
- .syntax divided\n");
+ if (r1 >= 16)
+ return 0xFF;
+ if (!r0->var04[r1].var00_7)
+ return 0xFF;
+ memset(&r0->var04[r1], 0, sizeof(r0->var04[r1]));
+ return r1;
}
-#endif
u8 sub_81249E4(struct UnkStruct3 *r0)
{
u8 i;
u8 returnval;
+
for (i = 0; i < r0->var04.var04; i++)
{
- u32 offset = r0->var04.var02 + i;
- struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset];
- struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset];
- switch(r0->var00_0)
+ struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i];
+ struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i];
+
+ switch (r0->var00_0)
{
- case 0x1:
- if ((u32)(faded->r + r0->var03) < 0x20)
+ case 1:
+ if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32)
faded->r += r0->var03;
- if ((u32)(faded->g + r0->var03) < 0x20)
+ if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32)
faded->g += r0->var03;
- if ((u32)(faded->b + r0->var03) < 0x20)
+ if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32)
faded->b += r0->var03;
- break;
- case 0x2:
+ break;
+ case 2:
if (r0->var03 < 0)
{
- if (!(faded->r + r0->var03 < unfaded->r))
+ if (faded->r + r0->var03 >= unfaded->r)
faded->r += r0->var03;
- if (!(faded->g + r0->var03 < unfaded->g))
+ if (faded->g + r0->var03 >= unfaded->g)
faded->g += r0->var03;
- if (!(faded->b + r0->var03 < unfaded->b))
+ if (faded->b + r0->var03 >= unfaded->b)
faded->b += r0->var03;
}
else
{
- if (!(faded->r + r0->var03 > unfaded->r))
+ if (faded->r + r0->var03 <= unfaded->r)
faded->r += r0->var03;
- if (!(faded->g + r0->var03 > unfaded->g))
+ if (faded->g + r0->var03 <= unfaded->g)
faded->g += r0->var03;
- if (!(faded->b + r0->var03 > unfaded->b))
+ if (faded->b + r0->var03 <= unfaded->b)
faded->b += r0->var03;
}
- break;
+ break;
}
}
- if (((u32)r0->var02++) != r0->var04.var07_0)
+ if ((u32)r0->var02++ != r0->var04.var07_0)
{
- returnval = 0x0;
+ returnval = 0;
}
else
{
- r0->var02 = 0x0;
- r0->var03 = r0->var03 * -1;
- if (r0->var00_0 == 0x1)
+ r0->var02 = 0;
+ r0->var03 *= -1;
+ if (r0->var00_0 == 1)
r0->var00_0++;
else
r0->var00_0--;
- returnval = 0x1;
+ returnval = 1;
}
return returnval;
}
@@ -153,34 +112,36 @@ u8 sub_81249E4(struct UnkStruct3 *r0)
u8 sub_8124BEC(struct UnkStruct3 *r0)
{
u8 rg2 = 0;
+
switch (r0->var00_0)
{
- case 0x1:
+ case 1:
for (rg2 = 0; rg2 < r0->var04.var04; rg2++)
gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00;
r0->var00_0++;
break;
- case 0x2:
+ case 2:
for (rg2 = 0; rg2 < r0->var04.var04; rg2++)
gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2];
r0->var00_0--;
break;
}
- return 0x1;
+ return 1;
}
void task_tutorial_controls_fadein(struct UnkStruct0 *r0)
{
u8 i = 0;
+
if (r0->var00)
{
- for (i = 0; i < 0x10; i++)
+ for (i = 0; i < 16; i++)
{
- if ((r0->var02 >> i) & 0x1)
+ if ((r0->var02 >> i) & 1)
{
- if (((u8)--r0->var04[i].var01) == 0xFF) // if underflow ?
+ if (--r0->var04[i].var01 == 0xFF) // if underflow ?
{
- if (r0->var04[i].var04.var00 & (0x80 << 8)) // PlttData->unused_15 ?
+ if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ?
sub_81249E4(&r0->var04[i]);
else
sub_8124BEC(&r0->var04[i]);
@@ -194,15 +155,16 @@ void task_tutorial_controls_fadein(struct UnkStruct0 *r0)
void sub_8124CE8(struct UnkStruct0 *r0, u16 r1)
{
u8 i = 0;
+
r0->var00++;
- for (i = 0; i < 0x10; i++)
+ for (i = 0; i < 16; i++)
{
- if ((r1 >> i) & 0x1)
+ if ((r1 >> i) & 1)
{
if (r0->var04[i].var00_7)
{
- r0->var02 |= 0x1 << i;
- r0->var04[i].var00_0 = 0x1;
+ r0->var02 |= 1 << i;
+ r0->var04[i].var00_0 = 1;
}
}
}
@@ -211,21 +173,22 @@ void sub_8124CE8(struct UnkStruct0 *r0, u16 r1)
void sub_8124D3C(struct UnkStruct0 *r0, u16 r1)
{
u8 i;
- for (i = 0; i < 0x10; i++)
+
+ for (i = 0; i < 16; i++)
{
- if ((r0->var02 >> i) & 0x1)
+ if ((r0->var02 >> i) & 1)
{
if (r0->var04[i].var00_7)
{
- if ((r1 >> i) & 0x1)
+ if ((r1 >> i) & 1)
{
u32 offset = r0->var04[i].var04.var02;
u16 *faded = &gPlttBufferFaded[offset];
u16 *unfaded = &gPlttBufferUnfaded[offset];
memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2);
- r0->var04[i].var00_0 = 0x0;
- r0->var04[i].var02 = 0x0;
- r0->var04[i].var01 = 0x0;
+ r0->var04[i].var00_0 = 0;
+ r0->var04[i].var02 = 0;
+ r0->var04[i].var01 = 0;
if (r0->var04[i].var04.var07_7 < 0)
r0->var04[i].var03 = 0xFF;
else
@@ -236,8 +199,8 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1)
}
if (r1 == 0xFFFF)
{
- r0->var00 = 0x0;
- r0->var02 = 0x0;
+ r0->var00 = 0;
+ r0->var02 = 0;
}
else
{
@@ -246,11 +209,10 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1)
}
void sub_8124DDC(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height)
{
-
u16 *_dest;
u8 i;
u8 j;
- i = 0x0;
+ i = 0;
dest = &dest[top * 32 + left];
for (; i < height; i++)
{
@@ -267,7 +229,7 @@ void sub_8124E2C(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height)
u16 *_src = src;
u8 i;
u8 j;
- i = 0x0;
+ i = 0;
dest = &dest[top * 32 + left];
for (; i < height; i++)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 22:49:38 +0000