Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #52 from rh-hideout/master

Browse Source 
同步expansion更新
This commit is contained in:
RoamerX 2025-05-27 21:11:35 +08:00 committed by GitHub
commit ecb535782e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@ -11228,11 +11228,7 @@ static void Cmd_various(void)
else else
gSideTimers[GetBattlerSide(battler)].auroraVeilTimer = gBattleTurnCounter + 5; gSideTimers[GetBattlerSide(battler)].auroraVeilTimer = gBattleTurnCounter + 5;
gSideTimers[GetBattlerSide(battler)].auroraVeilBattlerId = battler; gSideTimers[GetBattlerSide(battler)].auroraVeilBattlerId = battler;
gBattleCommunication[MULTISTRING_CHOOSER] = 5;
if (IsDoubleBattle() && CountAliveMonsInBattle(BATTLE_ALIVE_SIDE, gBattlerAttacker) == 2)
gBattleCommunication[MULTISTRING_CHOOSER] = 5;
else
gBattleCommunication[MULTISTRING_CHOOSER] = 5;
} }
break; break;
} }

12
src/ereader_helpers.c
View File

@ -665,16 +665,8 @@ int EReaderHandleTransfer(u8 mode, size_t size, const void *data, void *recvBuff
if (sSendRecvMgr.xferState != EREADER_XFER_CHK) if (sSendRecvMgr.xferState != EREADER_XFER_CHK)
{ {
if (sSendRecvMgr.isParent && sCounter1 > 2) EnableSio();
{ sSendRecvMgr.xferState = EREADER_XFER_CHK;
EnableSio();
sSendRecvMgr.xferState = EREADER_XFER_CHK;
}
else
{
EnableSio();
sSendRecvMgr.xferState = EREADER_XFER_CHK;
}
} }
} }
break; break;

2
src/overworld.c
View File

@ -3348,7 +3348,7 @@ static u8 ReformatItemDescription(u16 item, u8 *dest)
u8 count = 0; u8 count = 0;
u8 numLines = 1; u8 numLines = 1;
u8 maxChars = 32; u8 maxChars = 32;
u8 *desc = (u8 *)ItemId_GetDescription(item); u8 *desc = (u8 *)GetItemDescription(item);
while (*desc != EOS) while (*desc != EOS)
{ {

32
src/pokedex_plus_hgss.c
View File

@ -4678,45 +4678,27 @@ static void LoadTilesetTilemapHGSS(u8 page)
switch (page) switch (page)
{ {
case INFO_SCREEN: case INFO_SCREEN:
if (!HGSS_DECAPPED) DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_1_Gfx, 0x2000, 0, 0);
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_1_Gfx, 0x2000, 0, 0);
else
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_1_Gfx, 0x2000, 0, 0);
CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenInfo_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenInfo_Tilemap, 0, 0);
break; break;
case STATS_SCREEN: case STATS_SCREEN:
if (!HGSS_DECAPPED) DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_1_Gfx, 0x2000, 0, 0);
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_1_Gfx, 0x2000, 0, 0);
else
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_1_Gfx, 0x2000, 0, 0);
CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenStats_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenStats_Tilemap, 0, 0);
break; break;
case EVO_SCREEN: case EVO_SCREEN:
if (!HGSS_DECAPPED) DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_2_Gfx, 0x2000, 0, 0);
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_2_Gfx, 0x2000, 0, 0); CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenEvolution_Tilemap_PE, 0, 0);
else
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_2_Gfx, 0x2000, 0, 0);
CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenEvolution_Tilemap_PE, 0, 0);
break; break;
case FORMS_SCREEN: case FORMS_SCREEN:
if (!HGSS_DECAPPED) DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_2_Gfx, 0x2000, 0, 0);
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_2_Gfx, 0x2000, 0, 0);
else
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_2_Gfx, 0x2000, 0, 0);
CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenForms_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenForms_Tilemap, 0, 0);
break; break;
case CRY_SCREEN: case CRY_SCREEN:
if (!HGSS_DECAPPED) DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_3_Gfx, 0x2000, 0, 0);
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_3_Gfx, 0x2000, 0, 0);
else
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_3_Gfx, 0x2000, 0, 0);
CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenCry_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenCry_Tilemap, 0, 0);
break; break;
case SIZE_SCREEN: case SIZE_SCREEN:
if (!HGSS_DECAPPED) DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_3_Gfx, 0x2000, 0, 0);
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_3_Gfx, 0x2000, 0, 0);
else
DecompressAndLoadBgGfxUsingHeap(3, sPokedexPlusHGSS_Menu_3_Gfx, 0x2000, 0, 0);
CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenSize_Tilemap, 0, 0); CopyToBgTilemapBuffer(3, sPokedexPlusHGSS_ScreenSize_Tilemap, 0, 0);
break; break;
} }

5
src/scrcmd.c
View File

@ -2541,10 +2541,7 @@ bool8 ScrCmd_setberrytree(struct ScriptContext *ctx)
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE); Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
if (berry == 0) PlantBerryTree(treeId, berry, growthStage, FALSE);
PlantBerryTree(treeId, berry, growthStage, FALSE);
else
PlantBerryTree(treeId, berry, growthStage, FALSE);
return FALSE; return FALSE;
} }