diff options
| author | fig02 <fig02srl@gmail.com> | 2024-09-04 23:46:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 23:46:03 -0400 |
| commit | dbb059c6a725bc933b79fabf89ffbe1e39a43cbf (patch) | |
| tree | b08303c9af22058fc12344771d0813d7fe66c6d7 /src/code | |
| parent | 6051251c929c2b9f709740674da1a0ab795dfb88 (diff) | |
Target Mode Enum [Target Docs 7/?] (#2133)
* TargetMode Enum
* format
* add default comment
* bss
* bss 2
* fix bss 3
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 17 | ||||
| -rw-r--r-- | src/code/z_en_a_keep.c | 2 | ||||
| -rw-r--r-- | src/code/z_kankyo.c | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 00855214a..96617f496 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -882,7 +882,7 @@ void Actor_Init(Actor* actor, PlayState* play) { Actor_SetFocus(actor, 0.0f); Math_Vec3f_Copy(&actor->prevPos, &actor->world.pos); Actor_SetScale(actor, 0.01f); - actor->targetMode = 3; + actor->targetMode = TARGET_MODE_3; actor->minVelocityY = -20.0f; actor->xyzDistToPlayerSq = MAXFLOAT; actor->naviEnemyId = NAVI_ENEMY_NONE; @@ -1615,10 +1615,17 @@ typedef struct TargetRangeParams { #define TARGET_RANGE(range, leash) \ { SQ(range), (f32)range / leash } -TargetRangeParams sTargetRanges[] = { - TARGET_RANGE(70, 140), TARGET_RANGE(170, 255), TARGET_RANGE(280, 5600), TARGET_RANGE(350, 525), - TARGET_RANGE(700, 1050), TARGET_RANGE(1000, 1500), TARGET_RANGE(100, 105.36842), TARGET_RANGE(140, 163.33333), - TARGET_RANGE(240, 576), TARGET_RANGE(280, 280000), +TargetRangeParams sTargetRanges[TARGET_MODE_MAX] = { + TARGET_RANGE(70, 140), // TARGET_MODE_0 + TARGET_RANGE(170, 255), // TARGET_MODE_1 + TARGET_RANGE(280, 5600), // TARGET_MODE_2 + TARGET_RANGE(350, 525), // TARGET_MODE_3 + TARGET_RANGE(700, 1050), // TARGET_MODE_4 + TARGET_RANGE(1000, 1500), // TARGET_MODE_5 + TARGET_RANGE(100, 105.36842), // TARGET_MODE_6 + TARGET_RANGE(140, 163.33333), // TARGET_MODE_7 + TARGET_RANGE(240, 576), // TARGET_MODE_8 + TARGET_RANGE(280, 280000), // TARGET_MODE_9 }; /** diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 37c5abcf2..d99680ae5 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -152,7 +152,7 @@ void EnAObj_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, thisx, &sCylinderInit); thisx->colChkInfo.mass = MASS_IMMOVABLE; - thisx->targetMode = 0; + thisx->targetMode = TARGET_MODE_0; break; case A_OBJ_BOULDER_FRAGMENT: thisx->gravity = -1.5f; diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index e6036a27f..49fcbf435 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -212,7 +212,7 @@ s16 sLightningFlashAlpha; s16 sSunDepthTestX; s16 sSunDepthTestY; -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96" LightNode* sNGameOverLightNode; LightInfo sNGameOverLightInfo; |