atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up sub_8022C58

Browse source
This commit is contained in:
GriffinR 2020-05-21 12:49:41 -04:00 committed by huderlem
parent b29c7554ea
commit 89350cb81a
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/berry_crush.c
View file

@ -206,7 +206,7 @@ void sub_8022554(struct BerryCrushGame_138 *r0);
void sub_8024578(struct BerryCrushGame *); void sub_8024578(struct BerryCrushGame *);
void sub_8024644(u8 *, u32, u32, u32, u32); void sub_8024644(u8 *, u32, u32, u32, u32);
static void sub_8022A20(struct Sprite *sprite); static void sub_8022A20(struct Sprite *sprite);
static u32 sub_8022C58(struct BerryCrushGame *r6, u8 *r1); static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame *r6, u8 *r1);
static u32 sub_8022CB0(struct BerryCrushGame *r4, u8 *r5); static u32 sub_8022CB0(struct BerryCrushGame *r4, u8 *r5);
static u32 sub_8022D14(struct BerryCrushGame *r7, u8 *r5); static u32 sub_8022D14(struct BerryCrushGame *r7, u8 *r5);
static u32 sub_8022E1C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1); static u32 sub_8022E1C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1);
@ -767,7 +767,7 @@ static const u8 *const gUnknown_082F43B4[] =
static u32 (*const gUnknown_082F43CC[])(struct BerryCrushGame *, u8 *) = static u32 (*const gUnknown_082F43CC[])(struct BerryCrushGame *, u8 *) =
{ {
NULL, NULL,
sub_8022C58, BerryCrushCommand_BeginNormalPaletteFade,
sub_8022CB0, sub_8022CB0,
sub_8022D14, sub_8022D14,
sub_8022E1C, sub_8022E1C,
@ -1975,39 +1975,42 @@ void sub_8022BEC(u16 r5, u8 r4, u8 *r7)
} }
} }
static u32 sub_8022C58(struct BerryCrushGame *r6, u8 *r1) static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame *game, u8 *params)
{ {
u16 r4; // params points to packed values:
u32 r0; // bytes 0-3: selectedPals (bitfield)
#ifndef NONMATCHING // fake match, nobody can write such code // byte 4: delay
register u32 r2 asm("r2"); // byte 5: startY
register u32 r3 asm("r3"); // byte 6: stopY
// bytes 7-8: fade color
// byte 9: if TRUE, communicate on fade complete
r2 = r1[0]; u16 color;
r3 = r1[1]; u32 selectedPals;
r3 <<= 8; selectedPals = ({
r2 |= r3; #ifndef NONMATCHING
r3 = r1[2]; register u32 value asm("r2");
r3 <<= 16; register u32 b asm("r3");
r2 |= r3;
r3 = r1[3];
r3 <<= 24;
r0 = r2;
r0 |= r3;
#else #else
u32 r2; u32 value;
u32 b;
#endif //NONMATCHING
value = params[0] << 0;
value |= (b = params[1] << 8);
value |= (b = params[2] << 16);
value |= (b = params[3] << 24);
value;
});
params[0] = params[9];
color = params[8] << 8;
color |= params[7] << 0;
r0 = T1_READ_32(r1);
#endif
r2 = r1[9];
r1[0] = r2;
r4 = r1[8] << 8;
r2 = r1[7];
r4 |= r2;
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
BeginNormalPaletteFade(r0, r1[4], r1[5], r1[6], r4); BeginNormalPaletteFade(selectedPals, params[4], params[5], params[6], color);
UpdatePaletteFade(); UpdatePaletteFade();
r6->unkE = 2; game->unkE = 2;
return 0; return 0;
} }