ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-13 17:22:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

monMarks

Browse Source
This commit is contained in:
AsparagusEduardo 2020-03-07 23:05:34 -03:00 committed by huderlem
parent fdf1faa563
commit 1b9a01798e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pokemon_storage_system.c
View File

@ -231,7 +231,7 @@ struct PokemonStorageSystemData
struct Sprite *field_D94; struct Sprite *field_D94;
struct Sprite *field_D98[2]; struct Sprite *field_D98[2];
u16 *field_DA0; u16 *field_DA0;
struct PokemonMarkMenu field_DA4; struct PokemonMarkMenu monMarks;
struct UnkPSSStruct_2002370 field_1E5C; struct UnkPSSStruct_2002370 field_1E5C;
struct Pokemon movingMon; struct Pokemon movingMon;
struct Pokemon field_2108; struct Pokemon field_2108;
@ -2321,9 +2321,9 @@ static void Cb_InitPSS(u8 taskId)
if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{ {
sPSSData->field_DA4.baseTileTag = TAG_TILE_D; sPSSData->monMarks.baseTileTag = TAG_TILE_D;
sPSSData->field_DA4.basePaletteTag = TAG_PAL_DACE; sPSSData->monMarks.basePaletteTag = TAG_PAL_DACE;
sub_811F90C(&sPSSData->field_DA4); sub_811F90C(&sPSSData->monMarks);
sub_811FA90(); sub_811FA90();
} }
else else
@ -3178,7 +3178,7 @@ static void Cb_ShowMarkMenu(u8 taskId)
{ {
case 0: case 0:
PrintStorageActionText(PC_TEXT_MARK_POKE); PrintStorageActionText(PC_TEXT_MARK_POKE);
sPSSData->field_DA4.markings = sPSSData->cursorMonMarkings; sPSSData->monMarks.markings = sPSSData->cursorMonMarkings;
sub_811FAA4(sPSSData->cursorMonMarkings, 0xb0, 0x10); sub_811FAA4(sPSSData->cursorMonMarkings, 0xb0, 0x10);
sPSSData->state++; sPSSData->state++;
break; break;
@ -3187,7 +3187,7 @@ static void Cb_ShowMarkMenu(u8 taskId)
{ {
sub_811FAF8(); sub_811FAF8();
ClearBottomWindow(); ClearBottomWindow();
SetMonMarkings(sPSSData->field_DA4.markings); SetMonMarkings(sPSSData->monMarks.markings);
RefreshCursorMonData(); RefreshCursorMonData();
SetPSSCallback(Cb_MainPSS); SetPSSCallback(Cb_MainPSS);
} }