diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-17 11:32:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-17 11:32:30 -0400 |
commit | 164590e37d67a385bf6479aafcbe5b351891bc0b (patch) | |
tree | c3d4cac1627512d166440ead47d9f2285c8b4044 /src/reshow_battle_screen.c | |
parent | a4a3c1c9e5a0026415330eab9bea2f8f3e83e0a3 (diff) | |
parent | 1f39c34ca47e43b0afccaabe97d1df19e3f0b39b (diff) |
Merge pull request #1512 from GriffinRichards/minor-constants
Add some misc constants/usage
Diffstat (limited to 'src/reshow_battle_screen.c')
-rw-r--r-- | src/reshow_battle_screen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 6bc0e175b..c8c03ede2 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -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 *)(®_BG1CNT); + regBgcnt1 = (vBgCnt *)(®_BG1CNT); regBgcnt1->charBaseBlock = 0; - regBgcnt2 = (struct BGCntrlBitfield *)(®_BG2CNT); + regBgcnt2 = (vBgCnt *)(®_BG2CNT); regBgcnt2->charBaseBlock = 0; } |