diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /src/battle_script_commands.c | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index aec6eec8e..179a0ee79 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5230,7 +5230,7 @@ static void atk5D_getmoneyreward(void) } else { - moneyReward = sub_8054C04(); + moneyReward = ComputeWhiteOutMoneyLoss(); } PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward); if (moneyReward) @@ -5412,7 +5412,7 @@ static void atk5D_getmoneyreward(void) bl AddMoney\n\ b _08025A00\n\ _080259FA:\n\ - bl sub_8054C04\n\ + bl ComputeWhiteOutMoneyLoss\n\ adds r4, r0, 0\n\ _08025A00:\n\ ldr r1, _08025A40 @ =gBattleTextBuff1\n\ |