dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #401 from SethBarberee/emerald_backport_1

Browse Source 
Backport 2 nonmatching fixes from emerald
This commit is contained in:
GriffinR
2021-03-13 16:53:10 -05:00
committed by GitHub
parent 4d1e074514 6bcf9e64b1
commit e1f76f1689
2 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_crush_2.c
+18 -18
View File
@@ -149,29 +149,29 @@ static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game
// byte 9: if TRUE, communicate on fade complete // byte 9: if TRUE, communicate on fade complete
u16 color; u16 color;
u32 selectedPals; u32 selectedPals[2];
selectedPals = ({
#ifndef NONMATCHING
register u32 value asm("r2");
register u32 b asm("r3");
#else
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;
});
selectedPals[0] = (u32)params[0];
selectedPals[1] = (u32)params[1];
selectedPals[1] <<= 8;
selectedPals[0] |= selectedPals[1];
selectedPals[1] = (u32)params[2];
selectedPals[1] <<= 16;
selectedPals[0] |= selectedPals[1];
selectedPals[1] = (u32)params[3];
selectedPals[1] <<= 24;
selectedPals[0] |= selectedPals[1];
params[0] = params[9]; params[0] = params[9];
color = params[8] << 8; color = params[8];
color |= params[7] << 0; color <<= 8;
color |= params[7];
gPaletteFade.bufferTransferDisabled = FALSE; gPaletteFade.bufferTransferDisabled = FALSE;
BeginNormalPaletteFade(selectedPals, params[4], params[5], params[6], color); BeginNormalPaletteFade(selectedPals[0], params[4], params[5], params[6], color);
UpdatePaletteFade(); UpdatePaletteFade();
game->nextCmd = BCCMD_WaitPaletteFade; game->nextCmd = BCCMD_WaitPaletteFade;
return 0; return 0;
src/mystery_gift_menu.c
+7 -24
View File
@@ -1220,18 +1220,10 @@ void task00_mystery_gift(u8 taskId)
} }
break; break;
case 5: case 5:
{ *gStringVar1 = EOS;
#ifndef NONMATCHING *gStringVar2 = EOS;
register u8 eos asm("r1"); *gStringVar3 = EOS;
gStringVar1[0] = (eos = EOS);
gStringVar2[0] = eos;
gStringVar3[0] = eos;
#else
gStringVar1[0] = EOS;
gStringVar2[0] = EOS;
gStringVar3[0] = EOS;
#endif
}
switch (data->IsCardOrNews) switch (data->IsCardOrNews)
{ {
case 0: case 0:
@@ -1622,18 +1614,9 @@ void task00_mystery_gift(u8 taskId)
} }
break; break;
case 31: case 31:
{ *gStringVar1 = EOS;
#ifndef NONMATCHING *gStringVar2 = EOS;
register u8 eos asm("r1"); *gStringVar3 = EOS;
gStringVar1[0] = (eos = EOS);
gStringVar2[0] = eos;
gStringVar3[0] = eos;
#else
gStringVar1[0] = EOS;
gStringVar2[0] = EOS;
gStringVar3[0] = EOS;
#endif
}
if (data->IsCardOrNews == 0) if (data->IsCardOrNews == 0)
{ {
AddTextPrinterToWindow1(gText_SendingWonderCard); AddTextPrinterToWindow1(gText_SendingWonderCard);