Document Pokedex Screen

This commit is contained in:
PikalaxALT
2021-04-21 09:21:53 -04:00
parent cf553c7006
commit 704dc2f913
95 changed files with 1521 additions and 1718 deletions
+1 -1
View File
@@ -9179,7 +9179,7 @@ static void atkF2_displaydexinfo(void)
if (!gPaletteFade.active)
{
FreeAllWindowBuffers();
gBattleCommunication[TASK_ID] = sub_8106B60(species);
gBattleCommunication[TASK_ID] = DexScreen_RegisterMonToPokedex(species);
++gBattleCommunication[0];
}
break;
+2 -2
View File
@@ -1245,8 +1245,8 @@ const u32 gEasyChatRedRectangularCursor_Tiles[] = INCBIN_U32("graphics/interface
const u16 gPokeSummary_StatusAilmentIconPals[] = INCBIN_U16("graphics/interface/link_rfu_frame.gbapal");
const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface/link_rfu_status.4bpp.lz");
const u16 gUnknown_8E9C14C[] = INCBIN_U16("graphics/interface/pokedex_abc.gbapal");
const u16 gUnknown_8E9C16C[] = INCBIN_U16("graphics/interface/pokedex_abc.4bpp.lz");
const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/interface/pokedex_abc.gbapal");
const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/interface/pokedex_abc.4bpp.lz");
const u16 gPSSMenu_Pal[] = INCBIN_U16("graphics/interface/box_tiles_pal1.gbapal");
const u16 gUnknown_8E9C3F8[] = INCBIN_U16("graphics/interface/box_tiles_pal2.gbapal");
+2 -2
View File
@@ -748,12 +748,12 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value)
}
}
void sub_8107CD8(u8 palOffset, u16 speciesId)
void ListMenu_LoadMonIconPalette(u8 palOffset, u16 speciesId)
{
LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, 0x20);
}
void sub_8107CF8(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
void ListMenu_DrawMonIconGraphics(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
{
BlitBitmapToWindow(windowId, GetMonIconPtr(speciesId, personality, 1), x, y, 32, 32);
}
+1 -1
View File
@@ -22,7 +22,7 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data)
s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID)
{
return sub_8104AB0(nationalDexNo, caseID, 0);
return DexScreen_GetSetPokedexFlag(nationalDexNo, caseID, 0);
}
u16 GetNationalPokedexCount(u8 caseID)
+5 -5
View File
@@ -5,8 +5,8 @@
#include "wild_pokemon_area.h"
#include "pokedex_area_markers.h"
static const u16 sMarkerPal[] = INCBIN_U16("graphics/pokedex/area_markers/marker.gbapal");
static const u32 sMarkerTiles[] = INCBIN_U32("graphics/pokedex/area_markers/marker.4bpp.lz");
static const u16 sMarkerPal[] = INCBIN_U16("graphics/pokedex_area_markers/marker.gbapal");
static const u32 sMarkerTiles[] = INCBIN_U32("graphics/pokedex_area_markers/marker.4bpp.lz");
static const struct Subsprite sSubsprite0 = {
.size = ST_OAM_SIZE_0,
@@ -157,7 +157,7 @@ static void Task_ShowAreaMarkers(u8 taskId)
gSprites[data->spr_id].invisible = FALSE;
}
u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y)
u8 Ctor_PokedexAreaMarkers(u16 species, u16 tilesTag, u8 palIdx, u8 y)
{
struct SpriteTemplate spriteTemplate;
struct CompressedSpriteSheet spriteSheet;
@@ -201,7 +201,7 @@ u8 sub_8134230(u16 species, u16 tilesTag, u8 palIdx, u8 y)
return taskId;
}
void sub_81343F4(u8 taskId)
void Dtor_PokedexAreaMarkers(u8 taskId)
{
struct PAM_TaskData * data = (void *)gTasks[taskId].data;
FreeSpriteTilesByTag(data->tilesTag);
@@ -228,7 +228,7 @@ void SetAreaSubsprite(s32 i, s32 whichArea, struct Subsprite * subsprites)
subsprites[i].y = sSubspriteLookupTable[whichArea][2];
}
u8 sub_81344E0(u8 taskId)
u8 PokedexAreaMarkers_Any(u8 taskId)
{
struct PAM_TaskData * data = (void *)gTasks[taskId].data;
return data->subsprites.subspriteCount;
+1478 -1392
View File
File diff suppressed because it is too large Load Diff