dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup of main.c

Browse Source
This commit is contained in:
PikalaxALT
2020-04-10 20:16:31 -04:00
parent 2cb171b9fd
commit ec0edfd198
5 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_transition.c
+4 -6
View File
@@ -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);
}