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

through sub_809223C

Browse Source
This commit is contained in:
PikalaxALT
2020-03-14 13:50:15 -04:00
parent 6753e18db0
commit 5f7738672a
6 changed files with 868 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/pokemon_icon.h
+2
View File
@@ -4,6 +4,7 @@
#include "global.h"
extern const u16 gMonIconPalettes[][16];
extern const u8 gMonIconPaletteIndices[];
const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra);
@@ -26,5 +27,6 @@ void LoadMonIconPalette(u16 iconId);
void FreeMonIconPalette(u16 iconId);
void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum);
u8 GetMonIconPaletteIndexFromSpecies(u16 species);
u16 GetIconSpecies(u16 species, u32 personality);
#endif // GUARD_POKEMON_ICON_H
include/pokemon_storage_system.h
+1 -1
View File
@@ -36,7 +36,7 @@ void ZeroBoxMonAt(u8 boxId, u8 monPosition);
void Cb2_ReturnToPSS(void);
void ResetPokemonStorageSystem(void);
u8 StorageGetCurrentBox(void);
void DrawTextWindowAndBufferTiles(const u8 *name, void *a1, u8 a2, u8 a3, u8 *buffer, s32 a5);
void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero2, u8 *buffer, s32 bytesToBuffer);
void SetCurrentBox(u8 boxId);
void SetBoxWallpaper(u8 boxId, u8 wallpaperId);
struct Sprite *sub_809223C(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority);
include/pokemon_storage_system_internal.h
+17 -3
View File
@@ -7,6 +7,8 @@
#define IN_BOX_COLUMNS 5
#define IN_BOX_ROWS 6
#define MAX_MON_ICONS 40
enum
{
MODE_PARTY,
@@ -106,6 +108,14 @@ enum
#define TAG_TILE_7 0x7
#define TAG_TILE_0 0x0
#define TAG_TILE_1 0x1
#define TAG_TILE_6 0x6
struct WallpaperTable
{
const u32 *tiles;
const u32 *tileMap;
const u16 *palettes;
};
struct StorageAction
{
@@ -202,7 +212,8 @@ struct PokemonStorageSystemData
u16 field_2DE;
u16 field_2E0;
u8 filler[22];
u8 field_2F8[1024];
u8 field_2F8[512];
u8 field_4F8[512];
u8 field_6F8;
u8 field_6F9;
u8 field_6FA;
@@ -229,8 +240,8 @@ struct PokemonStorageSystemData
/* 0a84 */ struct Sprite *boxMonsSprites[IN_BOX_COUNT];
/* 0afc */ struct Sprite **field_B00;
/* 0b00 */ struct Sprite **field_B04;
/* 0b04 */ u16 field_B08[40];
/* 0b54 */ u16 field_B58[40];
/* 0b04 */ u16 field_B08[MAX_MON_ICONS];
/* 0b54 */ u16 field_B58[MAX_MON_ICONS];
/* 0ba4 */ u16 boxSpecies[IN_BOX_COUNT];
/* 0be0 */ u32 boxPersonalities[IN_BOX_COUNT];
/* 0c58 */ u8 field_C5C;
@@ -406,5 +417,8 @@ void InitMenu(void);
void SetMenuText(u8 textId);
void sub_8095C84(u8 cursorArea, u8 cursorPos);
void sub_8095E2C(u16 itemId);
u8 GetBoxWallpaper(u8 boxId);
bool8 IsCursorOnBox(void);
bool8 IsCursorInBox(void);
#endif //GUARD_POKEMON_STORAGE_SYSTEM_INTERNAL_H