diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-25 12:51:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 12:51:51 -0400 |
| commit | 1150e16b68c5e6fc2c7baf56ab061cea69d69953 (patch) | |
| tree | 55aafd11c76cb39fe2a83cc7839f5b0f7d7efa9c /src/battle_anim.c | |
| parent | cd8ac0ed9b9e9f53979409bf1a99d62132e5001b (diff) | |
| parent | aec808ac0d6266dc1c96ecf1aca998a06b11db19 (diff) | |
Merge pull request #450 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index ae4e6cf47..e4811137d 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -2183,8 +2183,8 @@ static void ScriptCmd_monbg(void) spriteId = gBattlerSpriteIds[battlerId]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[t1_MONBG_BATTLER] = spriteId; - gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + gTasks[taskId].data[1] = gSprites[spriteId].x + gSprites[spriteId].x2; + gTasks[taskId].data[2] = gSprites[spriteId].y + gSprites[spriteId].y2; if (!toBG_2) { gTasks[taskId].data[3] = gBattle_BG1_X; @@ -2214,8 +2214,8 @@ static void ScriptCmd_monbg(void) spriteId = gBattlerSpriteIds[battlerId]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[t1_MONBG_BATTLER] = spriteId; - gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + gTasks[taskId].data[1] = gSprites[spriteId].x + gSprites[spriteId].x2; + gTasks[taskId].data[2] = gSprites[spriteId].y + gSprites[spriteId].y2; if (!toBG_2) { gTasks[taskId].data[3] = gBattle_BG1_X; @@ -2268,8 +2268,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2) SetAnimBgAttribute(1, BG_ANIM_AREA_OVERFLOW_MODE, 0); battlerSpriteId = gBattlerSpriteIds[battlerId]; - gBattle_BG1_X = -(gSprites[battlerSpriteId].pos1.x + gSprites[battlerSpriteId].pos2.x) + 0x20; - gBattle_BG1_Y = -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20; + gBattle_BG1_X = -(gSprites[battlerSpriteId].x + gSprites[battlerSpriteId].x2) + 0x20; + gBattle_BG1_Y = -(gSprites[battlerSpriteId].y + gSprites[battlerSpriteId].y2) + 0x20; gSprites[gBattlerSpriteIds[battlerId]].invisible = TRUE; SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X); @@ -2293,8 +2293,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2) SetAnimBgAttribute(2, BG_ANIM_AREA_OVERFLOW_MODE, 0); battlerSpriteId = gBattlerSpriteIds[battlerId]; - gBattle_BG2_X = -(gSprites[battlerSpriteId].pos1.x + gSprites[battlerSpriteId].pos2.x) + 0x20; - gBattle_BG2_Y = -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20; + gBattle_BG2_X = -(gSprites[battlerSpriteId].x + gSprites[battlerSpriteId].x2) + 0x20; + gBattle_BG2_Y = -(gSprites[battlerSpriteId].y + gSprites[battlerSpriteId].y2) + 0x20; gSprites[gBattlerSpriteIds[battlerId]].invisible = TRUE; SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X); @@ -2356,8 +2356,8 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) spriteId = gTasks[taskId].data[0]; palIndex = gTasks[taskId].data[6]; GetBattleAnimBg1Data(&animBg); - x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x); - y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y); + x = gTasks[taskId].data[1] - (gSprites[spriteId].x + gSprites[spriteId].x2); + y = gTasks[taskId].data[2] - (gSprites[spriteId].y + gSprites[spriteId].y2); if (gTasks[taskId].data[5] == 0) { |