From e6da18503fbe55f4bb178ab3ec84e910c000728d Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 27 Feb 2024 19:23:28 +0000 Subject: [PATCH] document D_802946E0 (#1176) * document D_802946E0 * silly me * make not static * whoops again --- src/battle/1A5830.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/battle/1A5830.c b/src/battle/1A5830.c index 538528d8ff..64010e6243 100644 --- a/src/battle/1A5830.c +++ b/src/battle/1A5830.c @@ -4,8 +4,6 @@ #include "hud_element.h" #include "sprite.h" -s32 D_802946E0[] = { 100, 100, 100, 110, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130 }; - s32 has_enchanted_part(Actor* actor) { ActorPart* partIt = actor->partsTable; s32 ret = FALSE; @@ -2701,6 +2699,15 @@ API_CALLABLE(RemoveActor) { return ApiStatus_DONE2; } +/// Star Point multiplier, indexed by actor count. +/// +10% multiplier for three actors +/// +30% multiplier for four or more actors +s32 StarPointMultiplier[] = { + 100, 100, 100, + 110, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, +}; + API_CALLABLE(DropStarPoints) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; @@ -2730,7 +2737,7 @@ API_CALLABLE(DropStarPoints) { ntd = 0.0f; if (!(enemyLevel < playerLevel)) { - ntd = ((enemyLevel - playerLevel) * 0.5f) * D_802946E0[battleStatus->initialEnemyCount]; + ntd = ((enemyLevel - playerLevel) * 0.5f) * StarPointMultiplier[battleStatus->initialEnemyCount]; ntd = (ntd + 50.0f) / 100.0f; } numToDrop = ntd;