Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 04:23:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix multi partner intro

Browse Source
This commit is contained in:
cawtds 2026-04-06 01:44:36 +02:00
parent a0562624de
commit fe043d7340
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/battle_frontier/multi_battle_intro_bg_opponent.bin
View File

Binary file not shown.

BIN
graphics/battle_frontier/multi_battle_intro_bg_player.bin
View File

Binary file not shown.

8
src/battle_bg.c
View File

@ -916,7 +916,7 @@ static u8 GetBattleEnvironmentOverride(void)
return gBattleEnvironment;
}
if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
{
return BATTLE_ENVIRONMENT_LINK;
}
@ -1308,11 +1308,7 @@ void DrawBattleEntryBackground(void)
{
LoadBattleEnvironmentEntryGfx(BATTLE_ENVIRONMENT_GRASS);
}
else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
{
LoadBattleEnvironmentEntryGfx(BATTLE_ENVIRONMENT_BUILDING);
}
else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
{
if (TestRunner_Battle_GetForcedEnvironment()
&& gBattleEnvironmentInfo[gBattleEnvironment].background.tilemap