diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-01 15:25:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 15:25:22 -0400 |
commit | cd4462f58cce785f408af26a7a3b11ad08575a5a (patch) | |
tree | 2a35a97aa4fb1eae38861178967e6806b4f00e00 /src/battle_bg.c | |
parent | 471608b56abbdf70a452896a0d895ffa5b4b06f9 (diff) | |
parent | e006569719969870ce480916a23cfd157fdcf454 (diff) |
Merge pull request #474 from lioniac/master
Multiple renamings and removed some orphaned functions
Diffstat (limited to 'src/battle_bg.c')
-rw-r--r-- | src/battle_bg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c index 69e4d474a..f3480bd45 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -643,7 +643,7 @@ UNUSED void GetBattleTerrainGfxPtrs(u8 terrain, const u32 **tilesPtr, const u32 *palPtr = sBattleTerrainTable[terrain].palette; } -void sub_800F324(void) +void BattleInitBgsAndWindows(void) { ResetBgsAndClearDma3BusyFlags(FALSE); InitBgsFromTemplates(0, gBattleBgTemplates, NELEMS(gBattleBgTemplates)); @@ -654,7 +654,7 @@ void sub_800F324(void) void InitBattleBgsVideo(void) { EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); - sub_800F324(); + BattleInitBgsAndWindows(); SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); |