diff options
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index bffb9f591..143e61477 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -48,7 +48,7 @@ #include "constants/battle_frontier.h" #include "constants/decorations.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/field_specials.h" #include "constants/items.h" @@ -87,17 +87,17 @@ static EWRAM_DATA u32 sUnknown_0203AB70 = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; void TryLoseFansFromPlayTime(void); void SetPlayerGotFirstFans(void); u16 GetNumFansOfPlayerInTrainerFanClub(void); static void RecordCyclingRoadResults(u32, u8); -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId); static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId); static void Task_PCTurnOnEffect(u8); @@ -521,7 +521,7 @@ u8 GetLinkPartnerNames(void) return nLinkPlayers; } -void SpawnLinkPartnerEventObject(void) +void SpawnLinkPartnerObjectEvent(void) { u8 j = 0; s16 x = 0; @@ -575,25 +575,25 @@ void SpawnLinkPartnerEventObject(void) case VERSION_RUBY: case VERSION_SAPPHIRE: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_LINK_RS_BRENDAN; + linkSpriteId = OBJ_EVENT_GFX_LINK_RS_BRENDAN; else - linkSpriteId = EVENT_OBJ_GFX_LINK_RS_MAY; + linkSpriteId = OBJ_EVENT_GFX_LINK_RS_MAY; break; case VERSION_EMERALD: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL; else - linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL; break; default: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL; else - linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL; break; } - SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); - LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 240 - i, i); + SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); + LoadLinkPartnerObjectEventSpritePalette(linkSpriteId, 240 - i, i); j++; if (j == MAX_LINK_PLAYERS) { @@ -603,36 +603,36 @@ void SpawnLinkPartnerEventObject(void) } } -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) { u8 adjustedPaletteNum; // Note: This temp var is necessary; paletteNum += 6 doesn't match. adjustedPaletteNum = paletteNum + 6; - if (graphicsId == EVENT_OBJ_GFX_LINK_RS_BRENDAN || - graphicsId == EVENT_OBJ_GFX_LINK_RS_MAY || - graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL || - graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) + if (graphicsId == OBJ_EVENT_GFX_LINK_RS_BRENDAN || + graphicsId == OBJ_EVENT_GFX_LINK_RS_MAY || + graphicsId == OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL || + graphicsId == OBJ_EVENT_GFX_RIVAL_MAY_NORMAL) { - u8 obj = GetEventObjectIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (obj != EVENT_OBJECTS_COUNT) + u8 obj = GetObjectEventIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + if (obj != OBJECT_EVENTS_COUNT) { - u8 spriteId = gEventObjects[obj].spriteId; + u8 spriteId = gObjectEvents[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; sprite->oam.paletteNum = adjustedPaletteNum; switch (graphicsId) { - case EVENT_OBJ_GFX_LINK_RS_BRENDAN: - LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_LINK_RS_BRENDAN: + LoadPalette(gObjectEventPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_LINK_RS_MAY: - LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_LINK_RS_MAY: + LoadPalette(gObjectEventPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: - LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL: + LoadPalette(gObjectEventPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: + LoadPalette(gObjectEventPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); break; } } @@ -1304,15 +1304,15 @@ void IsGrassTypeInParty(void) void SpawnCameraObject(void) { - u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); - gEventObjects[obj].invisible = TRUE; - CameraObjectSetFollowedObjectId(gEventObjects[obj].spriteId); + u8 obj = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + gObjectEvents[obj].invisible = TRUE; + CameraObjectSetFollowedObjectId(gObjectEvents[obj].spriteId); } void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1585,9 +1585,9 @@ u16 ScriptGetPartyMonSpecies(void) } // Removed for Emerald -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - //TryInitLocalEventObject(6); + //TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) @@ -2843,11 +2843,11 @@ void SetBattleTowerLinkPlayerGfx(void) { if (gLinkPlayers[i].gender == MALE) { - VarSet(VAR_OBJ_GFX_ID_F - i, EVENT_OBJ_GFX_BRENDAN_NORMAL); + VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_BRENDAN_NORMAL); } else { - VarSet(VAR_OBJ_GFX_ID_F - i, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL); + VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL); } } } @@ -3433,9 +3433,9 @@ static void Task_DeoxysRockInteraction(u8 taskId) static void ChangeDeoxysRockLevel(u8 rockLevel) { - u8 eventObjectId; + u8 objectEventId; LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8); - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) PlaySE(SE_W109); @@ -3455,7 +3455,7 @@ static void ChangeDeoxysRockLevel(u8 rockLevel) gFieldEffectArguments[5] = 5; FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK); - Overworld_SetEventObjTemplateCoords(1, sDeoxysRockCoords[rockLevel][0], sDeoxysRockCoords[rockLevel][1]); + Overworld_SetObjEventTemplateCoords(1, sDeoxysRockCoords[rockLevel][0], sDeoxysRockCoords[rockLevel][1]); } static void WaitForDeoxysRockMovement(u8 taskId) |