diff options
Diffstat (limited to 'src/quest_log.c')
| -rw-r--r-- | src/quest_log.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index 04369f1c2..6b25150f3 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -19,9 +19,9 @@ #include "overworld.h" #include "field_fadetransition.h" #include "field_weather.h" -#include "field_map_obj.h" -#include "map_obj_80688E4.h" -#include "map_obj_lock.h" +#include "event_object_movement.h" +#include "event_object_80688E4.h" +#include "event_object_lock.h" #include "field_player_avatar.h" #include "field_control_avatar.h" #include "battle.h" @@ -571,30 +571,30 @@ static void sub_8110BE8(u8 a0) sub_815A008(questLog); - for (i = 0; i < NELEMS(gSaveBlock1Ptr->mapObjectTemplates); i++) + for (i = 0; i < NELEMS(gSaveBlock1Ptr->objectEventTemplates); i++) { - if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0) + if (gSaveBlock1Ptr->objectEventTemplates[i].x < 0) { - questLog->npcData[i].x = -1 * gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].x = -1 * gSaveBlock1Ptr->objectEventTemplates[i].x; questLog->npcData[i].negx = TRUE; } else { - questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x; + questLog->npcData[i].x = (u8)gSaveBlock1Ptr->objectEventTemplates[i].x; questLog->npcData[i].negx = FALSE; } - if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0) + if (gSaveBlock1Ptr->objectEventTemplates[i].y < 0) { - questLog->npcData[i].y = (-gSaveBlock1Ptr->mapObjectTemplates[i].y << 24) >> 24; + questLog->npcData[i].y = (-gSaveBlock1Ptr->objectEventTemplates[i].y << 24) >> 24; questLog->npcData[i].negy = TRUE; } else { - questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y; + questLog->npcData[i].y = (u8)gSaveBlock1Ptr->objectEventTemplates[i].y; questLog->npcData[i].negy = FALSE; } - questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation; - questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType; + questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].elevation; + questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].movementType; } } @@ -627,7 +627,7 @@ static void sub_8110D94(void) static void sub_8110E20(void) { - VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId); + VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapLayoutId); } static void sub_8110E3C(void) @@ -776,18 +776,18 @@ static void sub_8111150(u8 a0) for (i = 0; i < 64; i++) { if (questLog->npcData[i].negx) - gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x; + gSaveBlock1Ptr->objectEventTemplates[i].x = -questLog->npcData[i].x; else - gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x; + gSaveBlock1Ptr->objectEventTemplates[i].x = questLog->npcData[i].x; if (questLog->npcData[i].negy) - gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y; + gSaveBlock1Ptr->objectEventTemplates[i].y = -(u8)questLog->npcData[i].y; else - gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y; - gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation; - gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType; + gSaveBlock1Ptr->objectEventTemplates[i].y = questLog->npcData[i].y; + gSaveBlock1Ptr->objectEventTemplates[i].elevation = questLog->npcData[i].elevation; + gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType; } - sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates); + sub_815A1F8(questLog, gSaveBlock1Ptr->objectEventTemplates); } void sub_8111274(u8 a0, u8 a1) @@ -984,11 +984,11 @@ void sub_8111708(void) { struct MapHeader sp0; - gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE); - if (gSaveBlock1Ptr->mapDataId == 0) + gSaveBlock1Ptr->mapLayoutId = VarGet(VAR_0x40AE); + if (gSaveBlock1Ptr->mapLayoutId == 0) { sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); - gSaveBlock1Ptr->mapDataId = sp0.mapDataId; + gSaveBlock1Ptr->mapLayoutId = sp0.mapLayoutId; } } @@ -1347,7 +1347,7 @@ static void sub_8111F8C(u8 taskId) if (ScriptContext2_IsEnabled() != TRUE) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_805C270(); sub_805C780(); ScriptContext2_Enable(); @@ -1370,7 +1370,7 @@ static void sub_8111FCC(u8 taskId) task->data[0] = 0; task->data[1] = 0; task->func = sub_8112044; - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); } } @@ -1532,12 +1532,12 @@ void sub_8112450(void) void sub_811246C(struct Sprite *sprite) { - struct MapObject *mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->localId == 0xFF) + struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->localId == 0xFF) { if (gUnknown_203AF9A[0][0] != 0xFF) { - FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]); + ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[0][0]); gUnknown_203AF9A[0][0] = 0xFF; } if (gUnknown_203AF9A[0][1] != 0xFF) @@ -1545,16 +1545,16 @@ void sub_811246C(struct Sprite *sprite) sub_8150454(); gUnknown_203AF9A[0][1] = 0xFF; } - sub_8063E28(mapObject, sprite); + sub_8063E28(objectEvent, sprite); } else { - if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF) + if (gUnknown_203AF9A[objectEvent->localId][0] != 0xFF) { - FieldObjectSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]); - gUnknown_203AF9A[mapObject->localId][0] = 0xFF; + ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[objectEvent->localId][0]); + gUnknown_203AF9A[objectEvent->localId][0] = 0xFF; } - sub_8063E28(mapObject, sprite); + sub_8063E28(objectEvent, sprite); } } |