SCRIPTENV_CAMERA_TARGET

pret · May 15, 2023 · 76fac40 · 76fac40
1 parent 90026fd
commit 76fac40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/include/script.h b/include/script.h
@@ -57,7 +57,7 @@ typedef struct ScriptEnvironment {
     struct ListMenu2D *listMenu2D;
     int facingDirection;
     LocalMapObject *lastInteracted;
-    u32 cameraFocusObj;
+    u32 cameraTarget;
     LocalMapObject *unk_34;
     SCRIPTCONTEXT *scriptContexts[3];
     MSGFMT *msgfmt;
@@ -88,7 +88,7 @@ typedef enum ScriptEnvField {
     SCRIPTENV_ACTIVE_SCRIPT_NUMBER,
     SCRIPTENV_FACING_DIRECTION,
     SCRIPTENV_LAST_INTERACTED,
-    SCRIPTENV_CAMERA_FOCUS_OBJ                = 11,
+    SCRIPTENV_CAMERA_TARGET,
     SCRIPTENV_34                              = 12,
     SCRIPTENV_SCRCTX_0                        = 13,
     SCRIPTENV_SCRCTX_1                        = 14,

diff --git a/src/fieldmap.c b/src/fieldmap.c
@@ -239,8 +239,8 @@ void *FieldSysGetAttrAddrInternal(ScriptEnvironment *environment, enum ScriptEnv
         return &environment->facingDirection;
     case SCRIPTENV_LAST_INTERACTED:
         return &environment->lastInteracted;
-    case SCRIPTENV_CAMERA_FOCUS_OBJ:
-        return &environment->cameraFocusObj;
+    case SCRIPTENV_CAMERA_TARGET:
+        return &environment->cameraTarget;
     case SCRIPTENV_34:
         return &environment->unk_34;
     case SCRIPTENV_SCRCTX_0:

diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c
@@ -1181,7 +1181,7 @@ LocalMapObject *sub_02041C70(FieldSystem *fsys, u16 person) {
     if (person == 0xF2) {
         return sub_0205EEB4(fsys->mapObjectMan, 0x30);
     } else if (person == 0xF1) {
-        LocalMapObject **attr = FieldSysGetAttrAddr(fsys, SCRIPTENV_CAMERA_FOCUS_OBJ);
+        LocalMapObject **attr = FieldSysGetAttrAddr(fsys, SCRIPTENV_CAMERA_TARGET);
         return *attr;
     } else {
         return GetMapObjectByID(fsys->mapObjectMan, person);
@@ -1418,7 +1418,7 @@ BOOL ScrCmd_HidePerson(SCRIPTCONTEXT *ctx) {
 BOOL ScrCmd_102(SCRIPTCONTEXT *ctx) {
     u16 x = ScriptGetVar(ctx);
     u16 y = ScriptGetVar(ctx);
-    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ);
+    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET);
     VecFx32 *pos;
     *p_cameraObj = CreateSpecialFieldObject(ctx->fsys->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fsys->location->mapId);
     sub_02061070(*p_cameraObj);
@@ -1431,7 +1431,7 @@ BOOL ScrCmd_102(SCRIPTCONTEXT *ctx) {
 }
 
 BOOL ScrCmd_103(SCRIPTCONTEXT *ctx) {
-    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ);
+    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET);
     VecFx32 *pos;
     MapObject_Remove(*p_cameraObj);
     pos = MapObject_GetPositionVecPtr(GetMapObjectByID(ctx->fsys->mapObjectMan, obj_player));
@@ -1443,7 +1443,7 @@ BOOL ScrCmd_103(SCRIPTCONTEXT *ctx) {
 BOOL ScrCmd_678(SCRIPTCONTEXT *ctx) {
     u16 x = ScriptGetVar(ctx);
     u16 y = ScriptGetVar(ctx);
-    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ);
+    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET);
     *p_cameraObj = CreateSpecialFieldObject(ctx->fsys->mapObjectMan, x, y, 0, SPRITE_CAMERA_FOCUS, 0, ctx->fsys->location->mapId);
     sub_02061070(*p_cameraObj);
     MapObject_SetFlag9(*p_cameraObj, TRUE);
@@ -1452,7 +1452,7 @@ BOOL ScrCmd_678(SCRIPTCONTEXT *ctx) {
 }
 
 BOOL ScrCmd_679(SCRIPTCONTEXT *ctx) {
-    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_FOCUS_OBJ);
+    LocalMapObject **p_cameraObj = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_CAMERA_TARGET);
     MapObject_Remove(*p_cameraObj);
     return FALSE;
 }