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

22
src/secret_base.c
View File

@@ -147,17 +147,17 @@ static const struct YesNoFuncTable sDeleteRegistryYesNoFuncs =
static const u8 sSecretBaseOwnerGfxIds[10] =
{
// Male
EVENT_OBJ_GFX_YOUNGSTER,
EVENT_OBJ_GFX_BUG_CATCHER,
EVENT_OBJ_GFX_RICH_BOY,
EVENT_OBJ_GFX_CAMPER,
EVENT_OBJ_GFX_MAN_3,
OBJ_EVENT_GFX_YOUNGSTER,
OBJ_EVENT_GFX_BUG_CATCHER,
OBJ_EVENT_GFX_RICH_BOY,
OBJ_EVENT_GFX_CAMPER,
OBJ_EVENT_GFX_MAN_3,
// Female
EVENT_OBJ_GFX_LASS,
EVENT_OBJ_GFX_GIRL_3,
EVENT_OBJ_GFX_WOMAN_2,
EVENT_OBJ_GFX_PICNICKER,
EVENT_OBJ_GFX_WOMAN_5,
OBJ_EVENT_GFX_LASS,
OBJ_EVENT_GFX_GIRL_3,
OBJ_EVENT_GFX_WOMAN_2,
OBJ_EVENT_GFX_PICNICKER,
OBJ_EVENT_GFX_WOMAN_5,
};
static const struct WindowTemplate sRegistryWindowTemplates[] =
@@ -576,7 +576,7 @@ void InitSecretBaseDecorationSprites(void)
if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE
|| MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE)
{
gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - EVENT_OBJ_GFX_VAR_0);
gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - OBJ_EVENT_GFX_VAR_0);
VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]);
gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId;
FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004);