summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/renewable_hidden_items.c4
-rw-r--r--src/trainer_tower.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c
index 741b92b40..cbaa780e6 100644
--- a/src/renewable_hidden_items.c
+++ b/src/renewable_hidden_items.c
@@ -559,7 +559,8 @@ void SetAllRenewableItemFlags(void)
void IncrementRenewableHiddenItemStepCounter(void)
{
u16 var = VarGet(VAR_RENEWABLE_ITEM_STEP_COUNTER);
- if (var < 1500) {
+ if (var < 1500)
+ {
VarSet(VAR_RENEWABLE_ITEM_STEP_COUNTER, var + 1);
}
}
@@ -606,4 +607,3 @@ static void SampleRenewableItemFlags(void)
}
}
}
-
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index def4fc37d..c5631ee1b 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -653,7 +653,7 @@ void sub_815DDB0(void)
r1 = gUnknown_8479ED8[r3].unk0;
else
r1 = 18;
- VarSet(VAR_0x4011, r1);
+ VarSet(VAR_OBJ_GFX_ID_1, r1);
break;
case 1:
r2 = gUnknown_203F458->unk_0004.trainers[gUnknown_203F458->unk_0000].unk_004[0].unk_00B;
@@ -672,8 +672,8 @@ void sub_815DDB0(void)
r1 = 18;
r4_ = 18;
}
- VarSet(VAR_0x4010, r1);
- VarSet(VAR_0x4013, r4_);
+ VarSet(VAR_OBJ_GFX_ID_0, r1);
+ VarSet(VAR_OBJ_GFX_ID_3, r4_);
break;
case 2:
for (r4 = 0; r4 < 3; r4++)
@@ -691,13 +691,13 @@ void sub_815DDB0(void)
switch (r4)
{
case 0:
- VarSet(VAR_0x4012, r1);
+ VarSet(VAR_OBJ_GFX_ID_2, r1);
break;
case 1:
- VarSet(VAR_0x4010, r1);
+ VarSet(VAR_OBJ_GFX_ID_0, r1);
break;
case 2:
- VarSet(VAR_0x4011, r1);
+ VarSet(VAR_OBJ_GFX_ID_1, r1);
break;
}
}