diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-28 19:05:06 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-28 19:05:06 -0800 |
| commit | a030120a0c3b65cd1a35ec83644edca6985e5346 (patch) | |
| tree | e62d4aa047ff662b6e41ce0744f1e39fab9291e1 /src/manager | |
| parent | 7c1c612c9ba95b47f33cfd217ab99c4c9102531e (diff) | |
clean up linkAnimation.c
Diffstat (limited to 'src/manager')
| -rw-r--r-- | src/manager/cloudOverlayManager.c | 2 | ||||
| -rw-r--r-- | src/manager/delayedEntityLoadManager.c | 2 | ||||
| -rw-r--r-- | src/manager/enterRoomTextboxManager.c | 2 | ||||
| -rw-r--r-- | src/manager/ezloHintManager.c | 2 | ||||
| -rw-r--r-- | src/manager/fightManager.c | 4 | ||||
| -rw-r--r-- | src/manager/holeManager.c | 2 | ||||
| -rw-r--r-- | src/manager/hyruleTownTilesetManager.c | 2 | ||||
| -rw-r--r-- | src/manager/lightManager.c | 2 | ||||
| -rw-r--r-- | src/manager/minishVillageTilesetManager.c | 2 | ||||
| -rw-r--r-- | src/manager/miscManager.c | 4 | ||||
| -rw-r--r-- | src/manager/powBackgroundManager.c | 2 | ||||
| -rw-r--r-- | src/manager/repeatedSoundManager.c | 2 | ||||
| -rw-r--r-- | src/manager/secretManager.c | 4 | ||||
| -rw-r--r-- | src/manager/staticBackgroundManager.c | 2 | ||||
| -rw-r--r-- | src/manager/templeOfDropletsManager.c | 4 | ||||
| -rw-r--r-- | src/manager/vaati3BackgroundManager.c | 2 |
16 files changed, 20 insertions, 20 deletions
diff --git a/src/manager/cloudOverlayManager.c b/src/manager/cloudOverlayManager.c index 3cc20ca9..b9563b46 100644 --- a/src/manager/cloudOverlayManager.c +++ b/src/manager/cloudOverlayManager.c @@ -27,7 +27,7 @@ void CloudOverlayManager_Main(CloudOverlayManager* this) { super->timer = 0; super->subtimer = 8; this->field_0x20 = gUnk_0810865C[0]; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); if (gArea.onEnter == NULL) { RegisterTransitionManager(this, sub_0805AEDC, sub_0805AF3C); } else { diff --git a/src/manager/delayedEntityLoadManager.c b/src/manager/delayedEntityLoadManager.c index de9a8390..0a13bf40 100644 --- a/src/manager/delayedEntityLoadManager.c +++ b/src/manager/delayedEntityLoadManager.c @@ -37,7 +37,7 @@ void DelayedEntityLoadManager_Main(DelayedEntityLoadManager* this) { if (super->action == 0) { super->action++; this->unk_20 = gArea.filler[1]; - SetDefaultPriority((Entity*)this, 6); + SetEntityPriority((Entity*)this, 6); npcPtr = gNPCData; npcPtr += (super->type2 + this->unk_20); index1 = 0; diff --git a/src/manager/enterRoomTextboxManager.c b/src/manager/enterRoomTextboxManager.c index 959e90f9..a720a788 100644 --- a/src/manager/enterRoomTextboxManager.c +++ b/src/manager/enterRoomTextboxManager.c @@ -45,7 +45,7 @@ void sub_0805E140(EnterRoomTextboxManager* this) { this->unk_20 = gRoomControls.room; super->timer = 120; super->subtimer = 60; - SetDefaultPriority((Entity*)this, PRIO_HIGHEST); + SetEntityPriority((Entity*)this, PRIO_HIGHEST); sub_0805E1F8(gUnk_08108DE8[gArea.locationIndex], AreaIsDungeon()); } diff --git a/src/manager/ezloHintManager.c b/src/manager/ezloHintManager.c index afe8394a..f98b97f3 100644 --- a/src/manager/ezloHintManager.c +++ b/src/manager/ezloHintManager.c @@ -35,7 +35,7 @@ static void EzloHintManager_Init(EzloHintManager* this) { this->ry = this->ry_raw << 3; this->x = this->rx + (this->x_raw << 4); this->y = this->ry + (this->y_raw << 4); - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); if (this->flag2 == 0) { super->action = 2; } else { diff --git a/src/manager/fightManager.c b/src/manager/fightManager.c index 1f54b143..3f34f5c4 100644 --- a/src/manager/fightManager.c +++ b/src/manager/fightManager.c @@ -55,7 +55,7 @@ void FightManager_Init(FightManager* this) { if (!this->fightStartFlag) { FightManager_LoadFight(this); } - SetDefaultPriority((Entity*)this, PRIO_NO_BLOCK); + SetEntityPriority((Entity*)this, PRIO_NO_BLOCK); } else { DeleteThisEntity(); } @@ -157,7 +157,7 @@ void FightManagerHelper_Main(FightManagerHelper* this) { if (super->action == 0) { super->action = 1; - SetDefaultPriority((Entity*)this, PRIO_NO_BLOCK); + SetEntityPriority((Entity*)this, PRIO_NO_BLOCK); } // go through and check all monitored enemies. anyRemaining = FALSE; diff --git a/src/manager/holeManager.c b/src/manager/holeManager.c index 3b1d17cf..c220332b 100644 --- a/src/manager/holeManager.c +++ b/src/manager/holeManager.c @@ -57,7 +57,7 @@ void sub_0805B328(HoleManager*); void sub_0805B048(HoleManager* this) { struct_08108764* tmp; Entity* obj; - SetDefaultPriority((Entity*)super, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)super, PRIO_PLAYER_EVENT); MemClear(&this->unk_20, 0x20); super->action = 1; this->unk_3f = gRoomControls.room; diff --git a/src/manager/hyruleTownTilesetManager.c b/src/manager/hyruleTownTilesetManager.c index 308204f0..9797a0c2 100644 --- a/src/manager/hyruleTownTilesetManager.c +++ b/src/manager/hyruleTownTilesetManager.c @@ -66,7 +66,7 @@ void HyruleTownTilesetManager_Main(HyruleTownTilesetManager* this) { this->field_0x21 = 0xff; this->field_0x20 = 0xff; RegisterTransitionManager(this, sub_08059A2C, NULL); - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); } sub_08059A58(this); } diff --git a/src/manager/lightManager.c b/src/manager/lightManager.c index edad0b7d..c8d8241d 100644 --- a/src/manager/lightManager.c +++ b/src/manager/lightManager.c @@ -37,7 +37,7 @@ void LightManager_Main(LightManager* this) { super->flags |= ENT_PERSIST; super->timer = 17; this->unk20 = 0; - SetDefaultPriority((Entity*)this, 6); + SetEntityPriority((Entity*)this, 6); sub_0801E120(); sub_0801E154(super->timer); } diff --git a/src/manager/minishVillageTilesetManager.c b/src/manager/minishVillageTilesetManager.c index f82b9153..225ba477 100644 --- a/src/manager/minishVillageTilesetManager.c +++ b/src/manager/minishVillageTilesetManager.c @@ -111,7 +111,7 @@ void MinishVillageTilesetManager_Main(MinishVillageTilesetManager* this) { super->timer = 8; this->unk_20 = 0xFF; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); RegisterTransitionManager(this, sub_08057E30, 0); } if (sub_08057E40(this)) { diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index 80d4cffc..2fe982bb 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -212,7 +212,7 @@ void MiscManager_Type3(MiscManager* this) { void MiscManager_Type4(MiscManager* this) { if (super->action == 0) { super->action = 1; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); } if (CheckLocalFlag(0x6c)) { if (CheckLocalFlag(0x4b)) { @@ -430,7 +430,7 @@ void MiscManager_TypeE(MiscManager* this) { #if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) void MiscManager_TypeF(MiscManager* this) { - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); if (gPlayerEntity.action == PLAYER_TALKEZLO) { DeleteThisEntity(); } diff --git a/src/manager/powBackgroundManager.c b/src/manager/powBackgroundManager.c index 1aa2a0e1..d7a24f25 100644 --- a/src/manager/powBackgroundManager.c +++ b/src/manager/powBackgroundManager.c @@ -20,7 +20,7 @@ void PowBackgroundManager_Main(PowBackgroundManager* this) { if (super->action == 0) { super->action = 1; super->flags |= ENT_PERSIST; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); if (gArea.onEnter == NULL) { RegisterTransitionManager(this, sub_0805AFFC, NULL); } else { diff --git a/src/manager/repeatedSoundManager.c b/src/manager/repeatedSoundManager.c index d55677d6..ff2c534b 100644 --- a/src/manager/repeatedSoundManager.c +++ b/src/manager/repeatedSoundManager.c @@ -37,7 +37,7 @@ void CreateRepeatedSoundManager(Entity* entity, ScriptExecutionContext* context) manager->id = REPEATED_SOUND_MANAGER; manager->type = context->intVariable; AppendEntityToList((Entity*)manager, 6); - SetDefaultPriority((Entity*)manager, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)manager, PRIO_PLAYER_EVENT); } } diff --git a/src/manager/secretManager.c b/src/manager/secretManager.c index 4a9ba020..ca2ec125 100644 --- a/src/manager/secretManager.c +++ b/src/manager/secretManager.c @@ -51,7 +51,7 @@ void SecretManager_Type0_Init(SecretManager* this) { if (super->timer == 0) { super->timer = 30; } - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); } void SecretManager_Type0_Action1(SecretManager* this) { @@ -94,7 +94,7 @@ void SecretManager_Type1_Init(SecretManager* this) { super->timer = 30; } super->subtimer = super->timer; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); } void SecretManager_Type1_Action1(SecretManager* this) { diff --git a/src/manager/staticBackgroundManager.c b/src/manager/staticBackgroundManager.c index a8bd1810..2163b280 100644 --- a/src/manager/staticBackgroundManager.c +++ b/src/manager/staticBackgroundManager.c @@ -35,7 +35,7 @@ void StaticBackgroundManager_Main(StaticBackgroundManager* this) { if (super->action == 0) { super->action = 1; super->flags |= ENT_PERSIST; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); if (super->type != 0) { RegisterTransitionManager(this, sub_0805B4B4, NULL); } diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c index b1b97aba..7472dcbd 100644 --- a/src/manager/templeOfDropletsManager.c +++ b/src/manager/templeOfDropletsManager.c @@ -370,7 +370,7 @@ void TempleOfDropletsManager_Type7(TempleOfDropletsManager* this) { } super->subAction = 1; super->flags |= ENT_PERSIST; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); break; case 1: if (CheckLocalFlag(this->unk_3e)) @@ -402,7 +402,7 @@ void TempleOfDropletsManager_Type7(TempleOfDropletsManager* this) { void sub_0805AAC8(TempleOfDropletsManager*); void sub_0805A89C(TempleOfDropletsManager* this) { - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); super->action = 1; super->flags |= ENT_PERSIST; super->timer = 8; diff --git a/src/manager/vaati3BackgroundManager.c b/src/manager/vaati3BackgroundManager.c index 5b3bcc18..bc8847cf 100644 --- a/src/manager/vaati3BackgroundManager.c +++ b/src/manager/vaati3BackgroundManager.c @@ -22,7 +22,7 @@ void Vaati3BackgroundManager_Main(Vaati3BackgroundManager* this) { if (super->action == 0) { super->action = 1; super->flags |= ENT_PERSIST; - SetDefaultPriority((Entity*)this, PRIO_PLAYER_EVENT); + SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); if (gArea.onEnter == NULL) { RegisterTransitionManager(this, sub_0805D470, NULL); } else { |
