From 6283f7c0c2990633e28bf78008d8f5357d80d49e Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 7 Sep 2026 13:50:23 -0400 Subject: [PATCH] Label some move usage functions --- include/dungeon_action_handler.h | 2 +- include/dungeon_config.h | 2 +- include/dungeon_move_util.h | 2 +- src/dungeon_action_execution.c | 4 ++-- src/dungeon_action_handler.c | 4 ++-- src/dungeon_ai_attack.c | 2 +- src/dungeon_config.c | 2 +- src/dungeon_damage.c | 2 +- src/dungeon_mon_spawn.c | 2 +- src/dungeon_move_util.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/dungeon_action_handler.h b/include/dungeon_action_handler.h index af0fe0dd7..b1e688cc1 100644 --- a/include/dungeon_action_handler.h +++ b/include/dungeon_action_handler.h @@ -19,6 +19,6 @@ void HandleTalkFieldAction(Entity *entity); void sub_806752C(ActionContainer *a0); void sub_8067768(ActionContainer *a0); void HandleUseMovePlayerAction(Entity *entity); -void sub_8067904(Entity *entity, u16 moveId); +void UseTemporaryMove(Entity *entity, u16 moveId); #endif // GUARD_DUNGEON_ACTION_HANDLER_H diff --git a/include/dungeon_config.h b/include/dungeon_config.h index 0269129d1..7be831a4f 100644 --- a/include/dungeon_config.h +++ b/include/dungeon_config.h @@ -70,7 +70,7 @@ extern const s16 gShadowTagActivateChance; extern const s16 gMagnetPullActivateChance; extern const s16 gStaticActivateChance; extern const s16 gPoisonPointActivateChance; -extern const s16 gEffectSproreActivateChance; +extern const s16 gEffectSporeActivateChance; extern const s16 gFlameBodyActivateChance; extern const s16 gCuteCharmActivateChance; extern const s16 gStenchActivateChance; diff --git a/include/dungeon_move_util.h b/include/dungeon_move_util.h index f4e8f70b9..e6195d5ce 100644 --- a/include/dungeon_move_util.h +++ b/include/dungeon_move_util.h @@ -4,7 +4,7 @@ #include "structs/str_moves.h" #include "structs/dungeon_entity.h" -bool32 sub_8055A00(Entity *attacker, s32 firstMoveId, s32 var_34, s32 itemId, s32 arg_0); +bool32 TryUseMoveInMoveset(Entity *attacker, s32 firstMoveId, s32 var_34, s32 itemId, s32 arg_0); void TriggerTargetAbilityEffect(Entity *attacker); bool8 TryUseChosenMove(struct Entity *attacker, u32 r6, s32 itemId, u32 var_30, bool32 isLinkedMove, struct Move *move); bool8 sub_8056468(Entity *entity, Move *move, const u8 *str, Entity **unkArray, bool32 itemId, bool8 arg_4, bool32 unused); diff --git a/src/dungeon_action_execution.c b/src/dungeon_action_execution.c index 0ebb4cf52..c26e0ac4f 100644 --- a/src/dungeon_action_execution.c +++ b/src/dungeon_action_execution.c @@ -237,10 +237,10 @@ bool8 ExecuteEntityDungeonAction_Async(Entity *entity) HandleUseMovePlayerAction(entity); break; case ACTION_STRUGGLE: - sub_8067904(entity, MOVE_STRUGGLE); + UseTemporaryMove(entity, MOVE_STRUGGLE); break; case ACTION_REGULAR_ATTACK: - sub_8067904(entity, MOVE_REGULAR_ATTACK); + UseTemporaryMove(entity, MOVE_REGULAR_ATTACK); break; case ACTION_STEPPED_ON_TRAP: TryTriggerTrap(entity,&entity->pos,0,0); diff --git a/src/dungeon_action_handler.c b/src/dungeon_action_handler.c index fa8766b9d..b662c3743 100644 --- a/src/dungeon_action_handler.c +++ b/src/dungeon_action_handler.c @@ -745,7 +745,7 @@ void HandleUseMovePlayerAction(Entity *entity) while (i < sub_8070828(entity, TRUE)) { EntityInfo *info = GetEntInfo(entity); - sub_8055A00(entity, info->action.actionParameters[1].actionUseIndex, 1, 0, 0); + TryUseMoveInMoveset(entity, info->action.actionParameters[1].actionUseIndex, 1, 0, 0); if (IsFloorOver()) { break; } @@ -764,7 +764,7 @@ void HandleUseMovePlayerAction(Entity *entity) } } -void sub_8067904(Entity *entity, u16 moveId) +void UseTemporaryMove(Entity *entity, u16 moveId) { Move move; EntityInfo *info = GetEntInfo(entity); diff --git a/src/dungeon_ai_attack.c b/src/dungeon_ai_attack.c index 791cff300..a2ab79a77 100644 --- a/src/dungeon_ai_attack.c +++ b/src/dungeon_ai_attack.c @@ -884,7 +884,7 @@ void HandleUseMoveAIAction(Entity *target) if (counter >= sub_8070828(target, TRUE)) break; entityInfo = GetEntInfo(target); - sub_8055A00(target, entityInfo->action.actionParameters[0].actionUseIndex, 1, 0, 0); + TryUseMoveInMoveset(target, entityInfo->action.actionParameters[0].actionUseIndex, 1, 0, 0); if (!EntityIsValid(target)) break; if (IsFloorOver()) diff --git a/src/dungeon_config.c b/src/dungeon_config.c index 8ae2535f5..89a9e4afb 100644 --- a/src/dungeon_config.c +++ b/src/dungeon_config.c @@ -82,7 +82,7 @@ const s16 gShadowTagActivateChance = 12; const s16 gMagnetPullActivateChance = 12; const s16 gStaticActivateChance = 12; const s16 gPoisonPointActivateChance = 12; -const s16 gEffectSproreActivateChance = 12; +const s16 gEffectSporeActivateChance = 12; const s16 gFlameBodyActivateChance = 12; const s16 gCuteCharmActivateChance = 12; const s16 gStenchActivateChance = 12; diff --git a/src/dungeon_damage.c b/src/dungeon_damage.c index f94c0c44d..31677423d 100644 --- a/src/dungeon_damage.c +++ b/src/dungeon_damage.c @@ -181,7 +181,7 @@ void HandleDealingDamage_Async(Entity *attacker, Entity *target, struct DamageSt } if (AbilityIsActive(target, ABILITY_EFFECT_SPORE) && isPhysical - && DungeonRandInt(100) < gEffectSproreActivateChance) + && DungeonRandInt(100) < gEffectSporeActivateChance) { s32 rnd = DungeonRandInt(3); if (rnd < 1) diff --git a/src/dungeon_mon_spawn.c b/src/dungeon_mon_spawn.c index 5c3adfe1b..2be58a4af 100644 --- a/src/dungeon_mon_spawn.c +++ b/src/dungeon_mon_spawn.c @@ -781,7 +781,7 @@ static void InitEntityFromSpawnInfo(bool8 a0, Entity *entity, struct MonSpawnInf entInfo->mobileTurnTimer = 0; entInfo->attacking = FALSE; entInfo->unk149 = FALSE; - entInfo->abilityEffectFlags = FALSE; + entInfo->abilityEffectFlags = 0; entInfo->terrifiedTurns = 0; entInfo->useHeldItem = 0; entInfo->unk14B = 0; diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c index 65313ba66..b6a572284 100644 --- a/src/dungeon_move_util.c +++ b/src/dungeon_move_util.c @@ -49,7 +49,7 @@ static EWRAM_INIT Entity *gUnknown_203B438 = NULL; static u8 ToItemID(u32 itemID); -bool32 sub_8055A00(Entity *attacker, s32 firstMoveId, s32 var_34, s32 itemId, s32 arg_0) +bool32 TryUseMoveInMoveset(Entity *attacker, s32 firstMoveId, s32 var_34, s32 itemId, s32 arg_0) { s32 i, j; s32 moveId;