diff options
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index b9826a257..b8752b8a6 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -33,7 +33,7 @@ #include "task.h" #include "tv.h" #include "window.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/decorations.h" #include "constants/event_objects.h" #include "constants/items.h" @@ -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[] = @@ -437,7 +437,7 @@ bool8 SecretBaseMapPopupEnabled(void) static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH); if (IsWeatherNotFadingIn() == TRUE) { EnableBothScriptContexts(); @@ -531,13 +531,13 @@ void InitSecretBaseDecorationSprites(void) u8 i; u8 *decorations; u8 *decorationPositions; - u8 eventObjectId; + u8 objectEventId; u8 metatileBehavior; u8 category; u8 permission; u8 numDecorations; - eventObjectId = 0; + objectEventId = 0; if (!CurMapIsSecretBase()) { decorations = gSaveBlock1Ptr->playerRoomDecor; @@ -561,13 +561,13 @@ void InitSecretBaseDecorationSprites(void) category = gDecorations[decorations[i]].category; if (permission == DECORPERM_SPRITE) { - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - if (gMapHeader.events->eventObjects[eventObjectId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[objectEventId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) break; } - if (eventObjectId == gMapHeader.events->eventObjectCount) + if (objectEventId == gMapHeader.events->objectEventCount) continue; gSpecialVar_0x8006 = decorationPositions[i] >> 4; @@ -576,13 +576,13 @@ void InitSecretBaseDecorationSprites(void) if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) { - gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[eventObjectId].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->eventObjects[eventObjectId].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId; FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004); - TrySpawnEventObject(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0) { if (category == DECORCAT_DOLL) @@ -611,16 +611,16 @@ void InitSecretBaseDecorationSprites(void) void HideSecretBaseDecorationSprites(void) { - u8 eventObjectId; + u8 objectEventId; u16 flag; - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - flag = gMapHeader.events->eventObjects[eventObjectId].flagId; + flag = gMapHeader.events->objectEvents[objectEventId].flagId; if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14) { - RemoveEventObjectByLocalIdAndMap( - gMapHeader.events->eventObjects[eventObjectId].localId, + RemoveObjectEventByLocalIdAndMap( + gMapHeader.events->objectEvents[objectEventId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(flag); |