summaryrefslogtreecommitdiff
path: root/src/trainer_card.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/trainer_card.c')
-rw-r--r--src/trainer_card.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/trainer_card.c b/src/trainer_card.c
index beb209bf5..ca4dbb314 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -74,7 +74,7 @@ struct TrainerCardData
u16 cardTiles[0x1180];
u16 cardTilemapBuffer[0x1000];
u16 bgTilemapBuffer[0x1000];
- u16 var_7BCC;
+ u16 cardTop;
bool8 timeColonNeedDraw;
u8 language;
}; /* size = 0x7BD0 */
@@ -96,7 +96,7 @@ static u8 GetTrainerStarCount(struct TrainerCard *trainerCard);
static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType);
static void SetDataFromTrainerCard(void);
static void HandleGpuRegs(void);
-static void sub_8089BD8(u16 arg0);
+static void UpdateCardFlipRegs(u16 cardTop);
static void ResetGpuRegs(void);
static void TrainerCardNull(void);
static void sub_8089C5C(void);
@@ -961,16 +961,16 @@ static void HandleGpuRegs(void)
}
// Part of animating card flip
-static void sub_8089BD8(u16 arg0)
+static void UpdateCardFlipRegs(u16 cardTop)
{
- s8 quotient = (arg0 + 40) / 10;
+ s8 blendY = (cardTop + 40) / 10;
- if (quotient <= 4)
- quotient = 0;
+ if (blendY <= 4)
+ blendY = 0;
- sTrainerCardDataPtr->flipBlendY = quotient;
+ sTrainerCardDataPtr->flipBlendY = blendY;
SetGpuReg(REG_OFFSET_BLDY, sTrainerCardDataPtr->flipBlendY);
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(sTrainerCardDataPtr->var_7BCC, 160 - sTrainerCardDataPtr->var_7BCC));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(sTrainerCardDataPtr->cardTop, 160 - sTrainerCardDataPtr->cardTop));
}
static void ResetGpuRegs(void)
@@ -1673,8 +1673,8 @@ static bool8 Task_AnimateCardFlipDown(struct Task* task)
else
task->data[1] += 7;
- sTrainerCardDataPtr->var_7BCC = task->data[1];
- sub_8089BD8(task->data[1]);
+ sTrainerCardDataPtr->cardTop = task->data[1];
+ UpdateCardFlipRegs(task->data[1]);
r7 = task->data[1];
r9 = 160 - r7;
@@ -1799,8 +1799,8 @@ static bool8 Task_AnimateCardFlipUp(struct Task* task)
else
task->data[1] -= 5;
- sTrainerCardDataPtr->var_7BCC = task->data[1];
- sub_8089BD8(task->data[1]);
+ sTrainerCardDataPtr->cardTop = task->data[1];
+ UpdateCardFlipRegs(task->data[1]);
r7 = task->data[1];
r9 = 160 - r7;