Cleanup of main.c

1 files changed, 4 insertions, 6 deletions

diff --git a/src/battle_transition.c b/src/battle_transition.c
index b33d72f15..7c5b98a36 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1109,12 +1109,10 @@ static void SpriteCB_BT_Phase2SlidingPokeballs(struct Sprite *sprite)
 
             if (posX != sprite->data[2])
             {
-                u32 var;
                 u16 *ptr;
 
                 sprite->data[2] = posX;
-                var = (((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) & 0x1F) << 11);
-                ptr = (u16 *)(VRAM + var);
+                ptr = (u16 *)BG_SCREEN_ADDR((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) & 0x1F);
                 SOME_VRAM_STORE(ptr, posY - 2, posX, 0xF001);
                 SOME_VRAM_STORE(ptr, posY - 1, posX, 0xF001);
                 SOME_VRAM_STORE(ptr, posY - 0, posX, 0xF001);
@@ -3512,7 +3510,7 @@ static void BT_GetBg0TilesetBase(u16 **tilesetPtr)
     u16 charBase;
 
     charBase = GetGpuReg(REG_OFFSET_BG0CNT) >> 2;
-    charBase <<= 0xE;
+    charBase <<= 14;
     *tilesetPtr = (u16 *)(VRAM + charBase);
 }
 
@@ -3522,8 +3520,8 @@ static void BT_GetBg0TilemapAndTilesetBase(u16 **tilemapPtr, u16 **tilesetPtr)
 
     screenBase = (GetGpuReg(REG_OFFSET_BG0CNT) >> 8) & 0x1F;
     charBase = GetGpuReg(REG_OFFSET_BG0CNT) >> 2;
-    screenBase <<= 0xB;
-    charBase <<= 0xE;
+    screenBase <<= 11;
+    charBase <<= 14;
     *tilemapPtr = (u16 *)(VRAM + screenBase);
     *tilesetPtr = (u16 *)(VRAM + charBase);
 }