summaryrefslogtreecommitdiff
path: root/src/frontier_util.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-11-21 00:14:40 -0500
committerGriffinR <griffin.richards@comcast.net>2019-11-21 00:14:40 -0500
commit7034f59c14fd6fad2634e9b35b405e2b33f75646 (patch)
tree6c329c06e691eb8c702ff8b5982b1cb767e954de /src/frontier_util.c
parent98b81722e73bbc97145c7b2b20e160084dbd3587 (diff)
Rename EventObj to ObjEvent
Diffstat (limited to 'src/frontier_util.c')
-rw-r--r--src/frontier_util.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/frontier_util.c b/src/frontier_util.c
index e102c139a..a29714a32 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -663,7 +663,7 @@ static const struct WindowTemplate gUnknown_08611C84 =
};
// Second field - whether the character is female.
-static const u8 sFacilityToBrainEventObjGfx[][2] =
+static const u8 sFacilityToBrainObjEventGfx[][2] =
{
[FRONTIER_FACILITY_TOWER] = {OBJ_EVENT_GFX_ANABEL, TRUE},
[FRONTIER_FACILITY_DOME] = {OBJ_EVENT_GFX_TUCKER, FALSE},
@@ -2201,7 +2201,7 @@ static void sub_81A447C(void)
static void SetFacilityBrainObjectEvent(void)
{
- SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY));
+ SetFrontierBrainObjEventGfx(VarGet(VAR_FRONTIER_FACILITY));
}
// Battle Frontier Ranking Hall records.
@@ -2460,13 +2460,13 @@ void CopyFrontierBrainTrainerName(u8 *dst)
bool8 IsFrontierBrainFemale(void)
{
s32 facility = VarGet(VAR_FRONTIER_FACILITY);
- return sFacilityToBrainEventObjGfx[facility][1];
+ return sFacilityToBrainObjEventGfx[facility][1];
}
-void SetFrontierBrainEventObjGfx_2(void)
+void SetFrontierBrainObjEventGfx_2(void)
{
s32 facility = VarGet(VAR_FRONTIER_FACILITY);
- VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainEventObjGfx[facility][0]);
+ VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainObjEventGfx[facility][0]);
}
#define FRONTIER_BRAIN_OTID 61226
@@ -2766,10 +2766,10 @@ u16 GetFrontierBrainMonSpecies(u8 monId)
return sFrontierBrainsMons[facility][symbol][monId].species;
}
-void SetFrontierBrainEventObjGfx(u8 facility)
+void SetFrontierBrainObjEventGfx(u8 facility)
{
gTrainerBattleOpponent_A = TRAINER_FRONTIER_BRAIN;
- VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainEventObjGfx[facility][0]);
+ VarSet(VAR_OBJ_GFX_ID_0, sFacilityToBrainObjEventGfx[facility][0]);
}
u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId)