dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into berry_crush

Browse Source
This commit is contained in:
Kurausukun
2020-12-10 23:30:52 -05:00
parent 32ae13f9b6 8d29f65c6c
commit 58976ebaa8
500 changed files with 25386 additions and 24803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/use_pokeblock.c
+5 -5
View File
@@ -487,7 +487,7 @@ static void LoadUsePokeblockMenu(void)
{
case 0:
sMenu->curMonSpriteId = 0xFF;
sub_81D1ED4(&sMenu->graph);
InitConditionGraphData(&sMenu->graph);
sInfo->mainState++;
break;
case 1:
@@ -537,12 +537,12 @@ static void LoadUsePokeblockMenu(void)
sInfo->mainState++;
break;
case 11:
sub_81D2754(sMenu->graph.unk0[0], sMenu->graph.unk14[0]);
sub_81D20AC(&sMenu->graph);
sub_81D2754(sMenu->graph.stat[0], sMenu->graph.unk14[0]);
InitConditionGraphState(&sMenu->graph);
sInfo->mainState++;
break;
case 12:
if (!sub_81D20BC(&sMenu->graph))
if (!SetupConditionGraphScanlineParams(&sMenu->graph))
{
sub_81D1F84(&sMenu->graph, sMenu->graph.unk14[0], sMenu->graph.unk14[0]);
sInfo->mainState++;
@@ -1368,7 +1368,7 @@ static bool8 LoadUsePokeblockMenuGfx(void)
LoadBgTilemap(2, sMenu->tilemapBuffer, 1280, 0);
LoadPalette(gConditionGraphData_Pal, 48, 32);
LoadPalette(gConditionText_Pal, 240, 32);
sub_81D21DC(2);
SetConditionGraphIOWindows(2);
break;
default:
sMenu->info.helperState = 0;