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

Standardize EVENT_OBJECT to OBJECT_EVENT

Browse Source
This commit is contained in:
GriffinR
2019-11-20 23:12:51 -05:00
parent ec3e86f1d2
commit 82cb741d8b
611 changed files with 4984 additions and 4984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/battle_tower.c
View File

@@ -207,60 +207,60 @@ const u8 gTowerFemaleFacilityClasses[20] =
const u8 gTowerMaleTrainerGfxIds[30] =
{
EVENT_OBJ_GFX_HIKER,
EVENT_OBJ_GFX_TUBER_M,
EVENT_OBJ_GFX_MAN_3,
EVENT_OBJ_GFX_RICH_BOY,
EVENT_OBJ_GFX_MANIAC,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
EVENT_OBJ_GFX_BLACK_BELT,
EVENT_OBJ_GFX_MAN_5,
EVENT_OBJ_GFX_MAN_5,
EVENT_OBJ_GFX_CAMPER,
EVENT_OBJ_GFX_MANIAC,
EVENT_OBJ_GFX_PSYCHIC_M,
EVENT_OBJ_GFX_GENTLEMAN,
EVENT_OBJ_GFX_SCHOOL_KID_M,
EVENT_OBJ_GFX_POKEFAN_M,
EVENT_OBJ_GFX_EXPERT_M,
EVENT_OBJ_GFX_YOUNGSTER,
EVENT_OBJ_GFX_FISHERMAN,
EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
EVENT_OBJ_GFX_MAN_3,
EVENT_OBJ_GFX_MAN_5,
EVENT_OBJ_GFX_NINJA_BOY,
EVENT_OBJ_GFX_SAILOR,
EVENT_OBJ_GFX_MANIAC,
EVENT_OBJ_GFX_MAN_4,
EVENT_OBJ_GFX_CAMPER,
EVENT_OBJ_GFX_BUG_CATCHER,
EVENT_OBJ_GFX_HIKER
OBJ_EVENT_GFX_HIKER,
OBJ_EVENT_GFX_TUBER_M,
OBJ_EVENT_GFX_MAN_3,
OBJ_EVENT_GFX_RICH_BOY,
OBJ_EVENT_GFX_MANIAC,
OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M,
OBJ_EVENT_GFX_BLACK_BELT,
OBJ_EVENT_GFX_MAN_5,
OBJ_EVENT_GFX_MAN_5,
OBJ_EVENT_GFX_CAMPER,
OBJ_EVENT_GFX_MANIAC,
OBJ_EVENT_GFX_PSYCHIC_M,
OBJ_EVENT_GFX_GENTLEMAN,
OBJ_EVENT_GFX_SCHOOL_KID_M,
OBJ_EVENT_GFX_POKEFAN_M,
OBJ_EVENT_GFX_EXPERT_M,
OBJ_EVENT_GFX_YOUNGSTER,
OBJ_EVENT_GFX_FISHERMAN,
OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M,
OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M,
OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M,
OBJ_EVENT_GFX_MAN_3,
OBJ_EVENT_GFX_MAN_5,
OBJ_EVENT_GFX_NINJA_BOY,
OBJ_EVENT_GFX_SAILOR,
OBJ_EVENT_GFX_MANIAC,
OBJ_EVENT_GFX_MAN_4,
OBJ_EVENT_GFX_CAMPER,
OBJ_EVENT_GFX_BUG_CATCHER,
OBJ_EVENT_GFX_HIKER
};
const u8 gTowerFemaleTrainerGfxIds[20] =
{
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_TUBER_F,
EVENT_OBJ_GFX_WOMAN_5,
EVENT_OBJ_GFX_HEX_MANIAC,
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_BEAUTY,
EVENT_OBJ_GFX_LASS,
EVENT_OBJ_GFX_GIRL_3,
EVENT_OBJ_GFX_POKEFAN_F,
EVENT_OBJ_GFX_EXPERT_F,
EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
EVENT_OBJ_GFX_GIRL_3,
EVENT_OBJ_GFX_WOMAN_5,
EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
EVENT_OBJ_GFX_PICNICKER,
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_PICNICKER,
EVENT_OBJ_GFX_LASS
OBJ_EVENT_GFX_WOMAN_2,
OBJ_EVENT_GFX_TUBER_F,
OBJ_EVENT_GFX_WOMAN_5,
OBJ_EVENT_GFX_HEX_MANIAC,
OBJ_EVENT_GFX_WOMAN_2,
OBJ_EVENT_GFX_BEAUTY,
OBJ_EVENT_GFX_LASS,
OBJ_EVENT_GFX_GIRL_3,
OBJ_EVENT_GFX_POKEFAN_F,
OBJ_EVENT_GFX_EXPERT_F,
OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F,
OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F,
OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F,
OBJ_EVENT_GFX_GIRL_3,
OBJ_EVENT_GFX_WOMAN_5,
OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F,
OBJ_EVENT_GFX_PICNICKER,
OBJ_EVENT_GFX_WOMAN_2,
OBJ_EVENT_GFX_PICNICKER,
OBJ_EVENT_GFX_LASS
};
static const u8 sRubyFacilityClassToEmerald[][2] =
@@ -1482,13 +1482,13 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId)
{
case 0:
default:
VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1);
VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1);
return;
case 1:
VarSet(VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1);
VarSet(VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1);
return;
case 15:
VarSet(VAR_OBJ_GFX_ID_E, EVENT_OBJ_GFX_BOY_1);
VarSet(VAR_OBJ_GFX_ID_E, OBJ_EVENT_GFX_BOY_1);
return;
}
}
@@ -1547,7 +1547,7 @@ u8 GetBattleFacilityTrainerGfxId(u16 trainerId)
}
else
{
return EVENT_OBJ_GFX_BOY_1;
return OBJ_EVENT_GFX_BOY_1;
}
}
@@ -3695,7 +3695,7 @@ u8 FacilityClassToGraphicsId(u8 facilityClass)
}
else
{
return EVENT_OBJ_GFX_BOY_1;
return OBJ_EVENT_GFX_BOY_1;
}
}