dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename mapObect to objectEvent

Browse Source
This commit is contained in:
GriffinR
2019-11-21 01:40:38 -05:00
parent 570881b119
commit 8910739d8c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apprentice.c
+10 -10
View File
@@ -2103,7 +2103,7 @@ static void sub_81A1438(void)
static void sub_81A150C(void) static void sub_81A150C(void)
{ {
u8 i; u8 i;
u8 mapObjectGfxId; u8 objectEventGfxId;
u8 class = gApprentices[gSaveBlock2Ptr->apprentices[0].id].facilityClass; u8 class = gApprentices[gSaveBlock2Ptr->apprentices[0].id].facilityClass;
// Search male classes. // Search male classes.
@@ -2111,8 +2111,8 @@ static void sub_81A150C(void)
; ;
if (i != ARRAY_COUNT(gTowerMaleFacilityClasses)) if (i != ARRAY_COUNT(gTowerMaleFacilityClasses))
{ {
mapObjectGfxId = gTowerMaleTrainerGfxIds[i]; objectEventGfxId = gTowerMaleTrainerGfxIds[i];
VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId);
return; return;
} }
@@ -2120,23 +2120,23 @@ static void sub_81A150C(void)
; ;
if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses)) if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses))
{ {
mapObjectGfxId = gTowerFemaleTrainerGfxIds[i]; objectEventGfxId = gTowerFemaleTrainerGfxIds[i];
VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId);
} }
} }
static void Script_SetPlayerApprenticeTrainerGfxId(void) static void Script_SetPlayerApprenticeTrainerGfxId(void)
{ {
u8 i; u8 i;
u8 mapObjectGfxId; u8 objectEventGfxId;
u8 class = gApprentices[PLAYER_APPRENTICE.id].facilityClass; u8 class = gApprentices[PLAYER_APPRENTICE.id].facilityClass;
for (i = 0; i < ARRAY_COUNT(gTowerMaleFacilityClasses) && gTowerMaleFacilityClasses[i] != class; i++) for (i = 0; i < ARRAY_COUNT(gTowerMaleFacilityClasses) && gTowerMaleFacilityClasses[i] != class; i++)
; ;
if (i != ARRAY_COUNT(gTowerMaleFacilityClasses)) if (i != ARRAY_COUNT(gTowerMaleFacilityClasses))
{ {
mapObjectGfxId = gTowerMaleTrainerGfxIds[i]; objectEventGfxId = gTowerMaleTrainerGfxIds[i];
VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId);
return; return;
} }
@@ -2144,8 +2144,8 @@ static void Script_SetPlayerApprenticeTrainerGfxId(void)
; ;
if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses)) if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses))
{ {
mapObjectGfxId = gTowerFemaleTrainerGfxIds[i]; objectEventGfxId = gTowerFemaleTrainerGfxIds[i];
VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId);
} }
} }