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

Document mon markings

Browse Source
This commit is contained in:
GriffinR
2021-02-28 17:22:26 -05:00
committed by huderlem
parent 8bfd1370c9
commit 031da44cab
9 changed files with 240 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pokemon_storage_system.c
View File

@@ -2323,8 +2323,8 @@ static void Cb_InitPSS(u8 taskId)
{
sPSSData->markMenu.baseTileTag = TAG_TILE_D;
sPSSData->markMenu.basePaletteTag = TAG_PAL_DACE;
sub_811F90C(&sPSSData->markMenu);
sub_811FA90();
InitMonMarkingsMenu(&sPSSData->markMenu);
BufferMonMarkingsMenuTiles();
}
else
{
@@ -3179,13 +3179,13 @@ static void Cb_ShowMarkMenu(u8 taskId)
case 0:
PrintStorageActionText(PC_TEXT_MARK_POKE);
sPSSData->markMenu.markings = sPSSData->cursorMonMarkings;
sub_811FAA4(sPSSData->cursorMonMarkings, 0xb0, 0x10);
OpenMonMarkingsMenu(sPSSData->cursorMonMarkings, 0xb0, 0x10);
sPSSData->state++;
break;
case 1:
if (!MonMarkingsMenuHandleInput())
if (!HandleMonMarkingsMenuInput())
{
sub_811FAF8();
FreeMonMarkingsMenu();
ClearBottomWindow();
SetMonMarkings(sPSSData->markMenu.markings);
RefreshCursorMonData();
@@ -3983,7 +3983,7 @@ static void sub_80CA0D8(void)
static void sub_80CA154(void)
{
sPSSData->field_D94 = sub_811FFB4(TAG_TILE_10, TAG_PAL_DAC8, NULL);
sPSSData->field_D94 = CreateMonMarkingComboSprite(TAG_TILE_10, TAG_PAL_DAC8, NULL);
sPSSData->field_D94->oam.priority = 1;
sPSSData->field_D94->subpriority = 1;
sPSSData->field_D94->pos1.x = 40;
@@ -4126,7 +4126,7 @@ static void PrintCursorMonInfo(void)
CopyWindowToVram(0, 2);
if (sPSSData->cursorMonSpecies != SPECIES_NONE)
{
sub_8120084(sPSSData->cursorMonMarkings, sPSSData->field_DA0);
UpdateMonMarkingTiles(sPSSData->cursorMonMarkings, sPSSData->field_DA0);
sPSSData->field_D94->invisible = FALSE;
}
else