summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-24 12:39:40 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-24 12:39:40 -0500
commit9ecd065b5026126389e5011c2d99fced21b62794 (patch)
tree5c131dd3fdc095c0d78b7bb41354563a40bf6f3b
parentce5bc554e5739044af0c10eb6cc9231308fb28ce (diff)
Review changes
-rw-r--r--include/global.h12
-rw-r--r--src/trainer_tower.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/include/global.h b/include/global.h
index 561410a45..e33159898 100644
--- a/include/global.h
+++ b/include/global.h
@@ -697,12 +697,12 @@ struct TrainerTower
u32 bestTime;
u8 floorsCleared;
u8 unk9;
- u8 receivedPrize:1;
- u8 checkedFinalTime:1;
- u8 spokeToOwner:1;
- u8 hasLost:1;
- u8 unkA_4:1;
- u8 validated:1;
+ bool8 receivedPrize:1;
+ bool8 checkedFinalTime:1;
+ bool8 spokeToOwner:1;
+ bool8 hasLost:1;
+ bool8 unkA_4:1;
+ bool8 validated:1;
};
struct TrainerRematchState
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 0546f9bae..21120ad20 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -492,7 +492,7 @@ void InitTrainerTowerBattleStruct(void)
void FreeTrainerTowerBattleStruct(void)
{
- FREE_AND_SET_NULL(sTrainerTowerOpponent)
+ FREE_AND_SET_NULL(sTrainerTowerOpponent);
}
void GetTrainerTowerOpponentWinText(u8 *dest, u8 opponentIdx)
@@ -551,7 +551,7 @@ static void SetUpTrainerTowerDataStruct(void) // fakematching
static void FreeTrainerTowerDataStruct(void)
{
- FREE_AND_SET_NULL(sTrainerTowerState)
+ FREE_AND_SET_NULL(sTrainerTowerState);
}
static void InitTrainerTowerFloor(void)