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

Doc storage - misc cleanup, some item/cursor

Browse Source
This commit is contained in:
GriffinR 2021-04-17 00:49:51 -04:00
parent 96dabc1a7f
commit cd2a99b7c4
11 changed files with 445 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gflib/text.h
View File

@ -71,7 +71,7 @@
// //
#define CHAR_i_ACUTE 0x6F #define CHAR_i_ACUTE 0x6F
// //
#define CHAR_UNK_SPACER 0x77 #define CHAR_GENDERLESS 0x77 // Empty space for lack of gender icon
// //
#define CHAR_UP_ARROW 0x79 #define CHAR_UP_ARROW 0x79
#define CHAR_DOWN_ARROW 0x7A #define CHAR_DOWN_ARROW 0x7A

0
graphics/unknown/unknown_5722A0.bin → graphics/pokemon_storage/display_menu.bin
View File

0
graphics/unknown/unknown_572280.pal → graphics/pokemon_storage/display_menu.pal
View File

0
graphics/unknown/unknown_DD36C8.bin → graphics/pokemon_storage/party_menu.bin
View File

6
include/graphics.h
View File

@ -4875,12 +4875,12 @@ extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[];
extern const u16 gPokedexAreaScreenAreaUnknown_Pal[]; extern const u16 gPokedexAreaScreenAreaUnknown_Pal[];
// Pokemon Storage System // Pokemon Storage System
extern const u32 gPSSMenu_Gfx[]; extern const u32 gStorageSystemMenu_Gfx[];
extern const u16 gPSSMenu_Pal[]; extern const u16 gStorageSystemPartyMenu_Pal[];
extern const u32 gStorageSystemPartyMenu_Tilemap[];
extern const u32 gWallpaperIcon_Plusle[]; extern const u32 gWallpaperIcon_Plusle[];
extern const u32 gWallpaperIcon_Cross[]; extern const u32 gWallpaperIcon_Cross[];
extern const u32 gWallpaperIcon_Bolt[]; extern const u32 gWallpaperIcon_Bolt[];
extern const u32 gUnknown_08DD36C8[];
extern const u32 gWallpaperTiles_Ribbon[]; extern const u32 gWallpaperTiles_Ribbon[];
extern const u32 gWallpaperTilemap_Ribbon[]; extern const u32 gWallpaperTilemap_Ribbon[];
extern const u16 gWallpaperPalettes_Ribbon[][16]; extern const u16 gWallpaperPalettes_Ribbon[][16];

2
include/pokemon_storage_system.h
View File

@ -51,7 +51,7 @@ void ZeroBoxMonAt(u8 boxId, u8 boxPosition);
void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon *dst); void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon *dst);
struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 boxPosition); struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 boxPosition);
u8 *GetBoxNamePtr(u8 boxId); u8 *GetBoxNamePtr(u8 boxId);
s16 sub_80D214C(struct BoxPokemon *boxMons, u8 currIndex, u8 maxIndex, u8 arg3); s16 AdvanceStorageMonIndex(struct BoxPokemon *boxMons, u8 currIndex, u8 maxIndex, u8 arg3);
bool8 CheckFreePokemonStorageSpace(void); bool8 CheckFreePokemonStorageSpace(void);
bool32 CheckBoxMonSanityAt(u32 boxId, u32 boxPosition); bool32 CheckBoxMonSanityAt(u32 boxId, u32 boxPosition);
u32 CountStorageNonEggMons(void); u32 CountStorageNonEggMons(void);

2
src/battle_script_commands.c
View File

@ -6045,7 +6045,7 @@ static void PutLevelAndGenderOnLvlUpBox(void)
var = (u32)(txtPtr); var = (u32)(txtPtr);
txtPtr = ConvertIntToDecimalStringN(txtPtr, monLevel, STR_CONV_MODE_LEFT_ALIGN, 3); txtPtr = ConvertIntToDecimalStringN(txtPtr, monLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
var = (u32)(txtPtr) - var; var = (u32)(txtPtr) - var;
txtPtr = StringFill(txtPtr, CHAR_UNK_SPACER, 4 - var); txtPtr = StringFill(txtPtr, CHAR_GENDERLESS, 4 - var);
if (monGender != MON_GENDERLESS) if (monGender != MON_GENDERLESS)
{ {

6
src/graphics.c
View File

@ -1411,9 +1411,9 @@ const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_ca
// pokemon storage system // pokemon storage system
const u32 gPSSMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz"); const u32 gStorageSystemMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz");
const u16 gPSSMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu.gbapal"); const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu.gbapal"); // Only used by party menu, but generated from all menu gfx
const u32 gUnknown_08DD36C8[] = INCBIN_U32("graphics/unknown/unknown_DD36C8.bin.lz"); const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/party_menu.bin.lz");
// naming screen // naming screen

842
src/pokemon_storage_system.c
View File

File diff suppressed because it is too large Load Diff

2
src/pokemon_summary_screen.c
View File

@ -1569,7 +1569,7 @@ static void ChangeSummaryPokemon(u8 taskId, s8 delta)
else else
delta = 3; delta = 3;
} }
monId = sub_80D214C(sMonSummaryScreen->monList.boxMons, sMonSummaryScreen->curMonIndex, sMonSummaryScreen->maxMonIndex, delta); monId = AdvanceStorageMonIndex(sMonSummaryScreen->monList.boxMons, sMonSummaryScreen->curMonIndex, sMonSummaryScreen->maxMonIndex, delta);
} }
else if (IsMultiBattle() == TRUE) else if (IsMultiBattle() == TRUE)
{ {

2
src/pokenav_conditions_1.c
View File

@ -372,7 +372,7 @@ u8 *CopyMonConditionNameGender(u8 *str, u16 id, bool8 arg3)
switch (gender) switch (gender)
{ {
default: default:
*(str_++) = CHAR_UNK_SPACER; *(str_++) = CHAR_GENDERLESS;
break; break;
case MON_MALE: case MON_MALE:
*(str_++) = EXT_CTRL_CODE_BEGIN; *(str_++) = EXT_CTRL_CODE_BEGIN;