pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

document D_802946E0 (#1176)

Browse Source 
* document D_802946E0

* silly me

* make not static

* whoops again
This commit is contained in:
Alex Bates 2024-02-27 19:23:28 +00:00 committed by GitHub
parent c3cf1565fa
commit e6da18503f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle/1A5830.c
View File

@ -4,8 +4,6 @@
#include "hud_element.h" #include "hud_element.h"
#include "sprite.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) { s32 has_enchanted_part(Actor* actor) {
ActorPart* partIt = actor->partsTable; ActorPart* partIt = actor->partsTable;
s32 ret = FALSE; s32 ret = FALSE;
@ -2701,6 +2699,15 @@ API_CALLABLE(RemoveActor) {
return ApiStatus_DONE2; 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) { API_CALLABLE(DropStarPoints) {
BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus = &gBattleStatus;
PlayerData* playerData = &gPlayerData; PlayerData* playerData = &gPlayerData;
@ -2730,7 +2737,7 @@ API_CALLABLE(DropStarPoints) {
ntd = 0.0f; ntd = 0.0f;
if (!(enemyLevel < playerLevel)) { 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; ntd = (ntd + 50.0f) / 100.0f;
} }
numToDrop = ntd; numToDrop = ntd;