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

Change according to feedback

Browse source
This commit is contained in:
PokeCodec 2020-09-10 18:07:46 -04:00
parent 87769756f8
commit c1286c2fe2
3 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_script_commands.c
View file

@ -4650,7 +4650,8 @@ static void Cmd_switchinanim(void)
static void Cmd_jumpifcantswitch(void) static void Cmd_jumpifcantswitch(void)
{ {
s32 i, lastMonId; s32 i;
s32 lastMonId;
struct Pokemon *party; struct Pokemon *party;
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION)); gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION));

37
src/berry_crush.c
View file

@ -215,7 +215,7 @@ void sub_8022524(struct BerryCrushGame_138 *, u16);
void sub_8022B28(struct Sprite *); void sub_8022B28(struct Sprite *);
void sub_8022554(struct BerryCrushGame_138 *r0); 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 *, u8, u8, u16, u8);
static void sub_8022A20(struct Sprite *sprite); static void sub_8022A20(struct Sprite *sprite);
static u32 BerryCrushCommand_BeginNormalPaletteFade(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);
@ -2000,23 +2000,23 @@ static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame *game,
u32 selectedPals[2]; u32 selectedPals[2];
selectedPals[0] = (u32)params[0]; selectedPals[0] = (u32)params[0];
selectedPals[1] = (u32)params[1]; selectedPals[1] = (u32)params[1];
selectedPals[1] <<= 8; selectedPals[1] <<= 8;
selectedPals[0] |= selectedPals[1]; selectedPals[0] |= selectedPals[1];
selectedPals[1] = (u32)params[2]; selectedPals[1] = (u32)params[2];
selectedPals[1] <<= 16; selectedPals[1] <<= 16;
selectedPals[0] |= selectedPals[1]; selectedPals[0] |= selectedPals[1];
selectedPals[1] = (u32)params[3]; selectedPals[1] = (u32)params[3];
selectedPals[1] <<= 24; selectedPals[1] <<= 24;
selectedPals[0] |= selectedPals[1]; selectedPals[0] |= selectedPals[1];
params[0] = params[9]; params[0] = params[9];
color = params[8]; color = params[8];
color <<= 8; color <<= 8;
color |= params[7]; color |= params[7];
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
BeginNormalPaletteFade(selectedPals[0], params[4], params[5], params[6], color); BeginNormalPaletteFade(selectedPals[0], params[4], params[5], params[6], color);
@ -3281,14 +3281,11 @@ static void BerryCrush_SetPaletteFadeParams(u8 *params, bool8 communicateAfter,
params[9] = communicateAfter; params[9] = communicateAfter;
} }
void sub_8024644(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5) void sub_8024644(u8 *r0, u8 r1, u8 r2, u16 r3, u8 r5)
{ {
u8 sp[2];
0[(u16 *)sp] = r3;
r0[0] = r1; r0[0] = r1;
r0[1] = r2; r0[1] = r2;
r0[2] = sp[0]; r0[2] = ((u8 *)&r3)[0];
r0[3] = sp[1]; r0[3] = ((u8 *)&r3)[1];
r0[4] = r5; r0[4] = r5;
} }

15
src/dewford_trend.c
View file

@ -219,7 +219,7 @@ void BufferTrendyPhraseString(void)
ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1); ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1);
} }
#ifndef NONMATCHING
void TrendyPhraseIsOld(void) void TrendyPhraseIsOld(void)
{ {
u8 result = 0; u8 result = 0;
@ -237,19 +237,6 @@ void TrendyPhraseIsOld(void)
gSpecialVar_Result = result; gSpecialVar_Result = result;
} }
#else
void TrendyPhraseIsOld(void)
{
u8 result = 0;
if (gSaveBlock1Ptr->easyChatPairs[0].unk0_0 - gSaveBlock1Ptr->easyChatPairs[1].unk0_0 < 2)
{
if (!gSaveBlock1Ptr->easyChatPairs[0].unk1_6 && gSaveBlock1Ptr->easyChatPairs[1].unk1_6)
result = 1;
}
gSpecialVar_Result = result;
}
#endif
void GetDewfordHallPaintingNameIndex(void) void GetDewfordHallPaintingNameIndex(void)
{ {