diff options
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index c23a8c44c..972b63a0d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -33,7 +33,7 @@ #include "pokemon_summary_screen.h" #include "random.h" #include "constants/abilities.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/metatile_labels.h" #include "constants/moves.h" #include "constants/species.h" @@ -365,7 +365,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void) if (myLinkPlayerNumber != i) { rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gLinkPlayers[i].gender); - SpawnSpecialEventObjectParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); + SpawnSpecialObjectEventParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); j++; if (j == 4) { @@ -769,7 +769,7 @@ u8 GetLeadMonFriendshipScore(void) void CB2_FieldShowRegionMap(void) { - FieldInitRegionMap(c2_exit_to_overworld_1_continue_scripts_restart_music); + FieldInitRegionMap(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void FieldShowRegionMap(void) @@ -1134,7 +1134,7 @@ void sub_810E984(u8 taskId) gSpecialVar_Result = 1; gSpecialVar_0x8005 = gUnknown_0203925B; ShakeScreenInElevator(); - EventObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); + ObjectEventTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); sub_810EEDC(); Menu_EraseScreen(); DestroyTask(taskId); @@ -1595,15 +1595,15 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { - u8 eventObjectId = SpawnSpecialEventObjectParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gEventObjects[eventObjectId].invisible = 1; - CameraObjectSetFollowedObjectId(gEventObjects[eventObjectId].spriteId); + u8 objectEventId = SpawnSpecialObjectEventParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); + gObjectEvents[objectEventId].invisible = 1; + CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } void RemoveCameraDummy(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1871,9 +1871,9 @@ u16 ScriptGetPartyMonSpecies(void) return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL); } -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - TryInitLocalEventObject(6); + TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) |