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

backport 2 nonmatching fixes from emerald

Browse Source
This commit is contained in:
Seth Barberee
2021-03-12 16:16:57 -06:00
parent 4d1e074514
commit 6bcf9e64b1
2 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mystery_gift_menu.c
+7 -24
View File
@@ -1220,18 +1220,10 @@ void task00_mystery_gift(u8 taskId)
}
break;
case 5:
{
#ifndef NONMATCHING
register u8 eos asm("r1");
gStringVar1[0] = (eos = EOS);
gStringVar2[0] = eos;
gStringVar3[0] = eos;
#else
gStringVar1[0] = EOS;
gStringVar2[0] = EOS;
gStringVar3[0] = EOS;
#endif
}
*gStringVar1 = EOS;
*gStringVar2 = EOS;
*gStringVar3 = EOS;
switch (data->IsCardOrNews)
{
case 0:
@@ -1622,18 +1614,9 @@ void task00_mystery_gift(u8 taskId)
}
break;
case 31:
{
#ifndef NONMATCHING
register u8 eos asm("r1");
gStringVar1[0] = (eos = EOS);
gStringVar2[0] = eos;
gStringVar3[0] = eos;
#else
gStringVar1[0] = EOS;
gStringVar2[0] = EOS;
gStringVar3[0] = EOS;
#endif
}
*gStringVar1 = EOS;
*gStringVar2 = EOS;
*gStringVar3 = EOS;
if (data->IsCardOrNews == 0)
{
AddTextPrinterToWindow1(gText_SendingWonderCard);