ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925

Browse Source 
# Conflicts:
#	src/pokemon_summary_screen.c
This commit is contained in:
Eduardo Quezada D'Ottone 2022-10-01 17:32:32 -03:00
commit af171eb4d4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -30,7 +30,7 @@ build/
.DS_Store .DS_Store
*.ddump *.ddump
.idea/ .idea/
porymap.project.cfg porymap.*.cfg
prefabs.json prefabs.json
.vscode/ .vscode/
*.a *.a

2
include/pokemon_summary_screen.h
View File

@ -11,7 +11,7 @@ extern const u8 *const gNatureNamePointers[];
void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove);
void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void ShowPokemonSummaryScreenHandleDeoxys(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
u8 GetMoveSlotToReplace(void); u8 GetMoveSlotToReplace(void);
void SummaryScreen_SetAnimDelayTaskId(u8 taskId); void SummaryScreen_SetAnimDelayTaskId(u8 taskId);

4
src/decompress.c
View File

@ -277,7 +277,7 @@ bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet *src
struct SpriteSheet dest; struct SpriteSheet dest;
void *buffer; void *buffer;
buffer = AllocZeroed(*((u32 *)(&src->data[0])) >> 8); buffer = AllocZeroed(src->data[0] >> 8);
LZ77UnCompWram(src->data, buffer); LZ77UnCompWram(src->data, buffer);
dest.data = buffer; dest.data = buffer;
@ -294,7 +294,7 @@ bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette
struct SpritePalette dest; struct SpritePalette dest;
void *buffer; void *buffer;
buffer = AllocZeroed(*((u32 *)(&src->data[0])) >> 8); buffer = AllocZeroed(src->data[0] >> 8);
LZ77UnCompWram(src->data, buffer); LZ77UnCompWram(src->data, buffer);
dest.data = buffer; dest.data = buffer;
dest.tag = src->tag; dest.tag = src->tag;

2
src/pokemon_storage_system.c
View File

@ -3770,7 +3770,7 @@ static void Task_ChangeScreen(u8 taskId)
mode = sStorage->summaryScreenMode; mode = sStorage->summaryScreenMode;
FreePokeStorageData(); FreePokeStorageData();
if (mode == SUMMARY_MODE_NORMAL && boxMons == &sSavedMovingMon.box) if (mode == SUMMARY_MODE_NORMAL && boxMons == &sSavedMovingMon.box)
ShowPokemonSummaryScreenSet40EF(mode, boxMons, monIndex, maxMonIndex, CB2_ReturnToPokeStorage); ShowPokemonSummaryScreenHandleDeoxys(mode, boxMons, monIndex, maxMonIndex, CB2_ReturnToPokeStorage);
else else
ShowPokemonSummaryScreen(mode, boxMons, monIndex, maxMonIndex, CB2_ReturnToPokeStorage); ShowPokemonSummaryScreen(mode, boxMons, monIndex, maxMonIndex, CB2_ReturnToPokeStorage);
break; break;

8
src/pokemon_summary_screen.c
View File

@ -185,7 +185,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData
u8 filler40CA; u8 filler40CA;
u8 windowIds[8]; u8 windowIds[8];
u8 spriteIds[SPRITE_ARR_ID_COUNT]; u8 spriteIds[SPRITE_ARR_ID_COUNT];
bool8 unk40EF; bool8 handleDeoxys;
s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data
u8 unk_filler4[6]; u8 unk_filler4[6];
u8 splitIconSpriteId; u8 splitIconSpriteId;
@ -1211,10 +1211,10 @@ void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 ma
sMonSummaryScreen->newMove = newMove; sMonSummaryScreen->newMove = newMove;
} }
void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) void ShowPokemonSummaryScreenHandleDeoxys(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void))
{ {
ShowPokemonSummaryScreen(mode, mons, monIndex, maxMonIndex, callback); ShowPokemonSummaryScreen(mode, mons, monIndex, maxMonIndex, callback);
sMonSummaryScreen->unk40EF = TRUE; sMonSummaryScreen->handleDeoxys = TRUE;
} }
static void MainCB2(void) static void MainCB2(void)
@ -1497,7 +1497,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon)
sum->ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES); sum->ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
break; break;
case 2: case 2:
if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == SUMMARY_MODE_BOX || sMonSummaryScreen->unk40EF == TRUE) if (sMonSummaryScreen->monList.mons == gPlayerParty || sMonSummaryScreen->mode == SUMMARY_MODE_BOX || sMonSummaryScreen->handleDeoxys == TRUE)
{ {
sum->nature = GetNature(mon); sum->nature = GetNature(mon);
sum->currentHP = GetMonData(mon, MON_DATA_HP); sum->currentHP = GetMonData(mon, MON_DATA_HP);