dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Add TRACKS_ALL, remove BGCntrlBitfield

Browse Source
This commit is contained in:
GriffinR
2021-10-09 11:33:37 -04:00
parent e26f9d10d7
commit 28de627913
22 changed files with 54 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/reshow_battle_screen.c
+6 -6
View File
@@ -21,7 +21,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void);
static bool8 LoadBattlerSpriteGfx(u8 battlerId);
static void CreateBattlerSprite(u8 battlerId);
static void CreateHealthboxSprite(u8 battlerId);
static void sub_80A95F4(void);
static void ClearBattleBgCntBaseBlocks(void);
void ReshowBattleScreenDummy(void)
{
@@ -158,7 +158,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
break;
default:
SetVBlankCallback(VBlankCB_Battle);
sub_80A95F4();
ClearBattleBgCntBaseBlocks();
BeginHardwarePaletteFade(0xFF, 0, 0x10, 0, 1);
gPaletteFade.bufferTransferDisabled = 0;
SetMainCallback2(BattleMainCB2);
@@ -169,14 +169,14 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
gBattleScripting.reshowMainState++;
}
static void sub_80A95F4(void)
static void ClearBattleBgCntBaseBlocks(void)
{
struct BGCntrlBitfield *regBgcnt1, *regBgcnt2;
vBgCnt *regBgcnt1, *regBgcnt2;
regBgcnt1 = (struct BGCntrlBitfield *)(&REG_BG1CNT);
regBgcnt1 = (vBgCnt *)(&REG_BG1CNT);
regBgcnt1->charBaseBlock = 0;
regBgcnt2 = (struct BGCntrlBitfield *)(&REG_BG2CNT);
regBgcnt2 = (vBgCnt *)(&REG_BG2CNT);
regBgcnt2->charBaseBlock = 0;
}