ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

More storage work

Browse Source
This commit is contained in:
DizzyEggg 2018-12-09 21:06:43 +01:00
parent e0f3de0b74
commit 431e7e7e5c
4 changed files with 1286 additions and 2791 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2729
asm/pokemon_storage_system.s
View File

File diff suppressed because it is too large Load Diff

7
include/mon_markings.h
View File

@ -22,7 +22,14 @@ struct PokemonMarkMenu
}; // 10b8 }; // 10b8
void sub_811F90C(struct PokemonMarkMenu *ptr); void sub_811F90C(struct PokemonMarkMenu *ptr);
void sub_811F918(void);
bool8 sub_811F960(void);
void sub_811FA90(void); void sub_811FA90(void);
void sub_811FAA4(u8 markings, s16 x, s16 y);
void sub_811FAF8(void);
bool8 sub_811FBA4(void);
struct Sprite *sub_811FF94(u16 tileTag, u16 paletteTag, const u16 *palette); struct Sprite *sub_811FF94(u16 tileTag, u16 paletteTag, const u16 *palette);
struct Sprite *sub_811FFB4(u16 tileTag, u16 paletteTag, const u16 *palette);
void sub_8120084(u8 markings, void *dest);
#endif //POKEEMERALD_MON_MARKINGS_H #endif //POKEEMERALD_MON_MARKINGS_H

21
include/pokemon_storage_system.h
View File

@ -76,12 +76,12 @@ struct PokemonStorageSystemData
u8 unk_02C7; u8 unk_02C7;
u8 unk_02C8; u8 unk_02C8;
u8 unk_02C9; u8 unk_02C9;
s16 field_2CA; s16 newCurrBoxId;
u16 bg2_X; u16 bg2_X;
u8 field_2CE; u8 field_2CE;
u8 field_2CF[1217]; u8 field_2CF[1215];
u8 changeWallpaper; s16 wallpaperSetId;
u8 field_791; s16 wallpaperId;
u8 wallpaperTilemap[180 * 4]; u8 wallpaperTilemap[180 * 4];
u8 wallpaperChangeState; u8 wallpaperChangeState;
u8 field_A63; u8 field_A63;
@ -92,9 +92,18 @@ struct PokemonStorageSystemData
u8 *wallpaperTilemapPtr; u8 *wallpaperTilemapPtr;
u8 field_A6C; u8 field_A6C;
u8 field_A6D[633]; u8 field_A6D[633];
u16 field_CE6; u16 selectedItem;
u8 field_CE8[188]; u16 field_CE8;
u8 field_CEA;
u8 field_CEB;
u8 field_CEC;
u8 field_CED;
u8 field_CEE;
u8 field_CEF[181];
struct PokemonMarkMenu field_DA4; struct PokemonMarkMenu field_DA4;
struct UnkPSSStruct_2002370 field_1E5C;
u8 field_20A4[400];
u16 field_2234;
}; };
extern struct UnkPSSStruct_2002370 *gUnknown_02039D04; extern struct UnkPSSStruct_2002370 *gUnknown_02039D04;

1320
src/pokemon_storage_system.c
View File

File diff suppressed because it is too large Load Diff