diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-31 13:04:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 13:04:52 -0500 |
| commit | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (patch) | |
| tree | 32cba14641d7f357b07ae227459fd4b059e22267 /src/battle_message.c | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
| parent | f724213a040f3c6a2f9685d52ae4e06d57aa0c41 (diff) | |
Merge pull request #94 from DizzyEggg/decompile_battle_controllers
Decompile ALL battle controllers
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index aeff721d6..52c0c7af5 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1858,16 +1858,16 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst) toCpy = gLinkPlayers[multiplayerID].name; break; case B_TXT_1F: // link partner name? - toCpy = gLinkPlayers[sub_806D864(2 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; + toCpy = gLinkPlayers[GetBankMultiplayerId(2 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; break; case B_TXT_20: // link opponent 1 name? - toCpy = gLinkPlayers[sub_806D864(1 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; + toCpy = gLinkPlayers[GetBankMultiplayerId(1 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; break; case B_TXT_21: // link opponent 2 name? - toCpy = gLinkPlayers[sub_806D864(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; + toCpy = gLinkPlayers[GetBankMultiplayerId(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; break; case B_TXT_22: // link scripting active name - toCpy = gLinkPlayers[sub_806D864(gBattleScripting.bank)].name; + toCpy = gLinkPlayers[GetBankMultiplayerId(gBattleScripting.bank)].name; break; case B_TXT_PLAYER_NAME: // player name if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) @@ -2209,7 +2209,7 @@ static void sub_814F950(u8* dst) } } -void sub_814F9EC(const u8 *text, u8 arg1) +void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) { const u8 *r8 = gUnknown_085CD660[gBattleScripting.field_24]; bool32 r9; |