diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-18 15:25:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 15:25:46 -0400 |
| commit | ed16a7409ae9c808a110975dec1930f9f949a6d6 (patch) | |
| tree | 662be8b474b9c50264fc49262cbaf21769479516 /src/battle_message.c | |
| parent | 5075067ecd8718ab96a063946662c71fe3ef5369 (diff) | |
| parent | c5aa5d37229e5692355e4b3979b6cafbcad7caee (diff) | |
Merge pull request #403 from PikalaxALT/battle_multi_buffer
Battle documentation (14032021)
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 68f75ffa1..20b7f9c75 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1469,7 +1469,7 @@ void BufferStringBattle(u16 stringId) gLastUsedItem = sBattleMsgDataPtr->lastItem; gLastUsedAbility = sBattleMsgDataPtr->lastAbility; gBattleScripting.battler = sBattleMsgDataPtr->scrActive; - *(&gBattleStruct->field_52) = sBattleMsgDataPtr->unk1605E; + *(&gBattleStruct->scriptPartyIdx) = sBattleMsgDataPtr->bakScriptPartyIdx; *(&gBattleStruct->hpScale) = sBattleMsgDataPtr->hpScale; gPotentialItemEffectBattler = sBattleMsgDataPtr->itemEffectBattler; *(&gBattleStruct->stringMoveType) = sBattleMsgDataPtr->moveType; @@ -1983,7 +1983,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) toCpy = gTrainerClassNames[GetSecretBaseTrainerNameIndex()]; else if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00) - toCpy = gTrainerClassNames[sub_80447F0()]; + toCpy = gTrainerClassNames[GetUnionRoomTrainerClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = gTrainerClassNames[GetBattleTowerTrainerClassNameId()]; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) @@ -2079,7 +2079,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gStringVar4; break; case B_TXT_26: // ? - HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, *(&gBattleStruct->field_52)) + HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, *(&gBattleStruct->scriptPartyIdx)) break; case B_TXT_PC_CREATOR_NAME: // lanette pc if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) @@ -2379,6 +2379,9 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { const u8 gUnknown_83FEC90[] = {0x04, 0x05, 0x02, 0x02}; +// windowId: Upper 2 bits are text flags +// x40: Use NPC context-defined font +// x80: Inhibit window clear void BattlePutTextOnWindow(const u8 *text, u8 windowId) { bool32 copyToVram; struct TextPrinterTemplate printerTemplate; @@ -2457,7 +2460,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) { } } -bool8 sub_80D89B0(u16 stringId) +bool8 BattleStringShouldBeColored(u16 stringId) { if (stringId == STRINGID_TRAINER1LOSETEXT || stringId == STRINGID_TRAINER2CLASS || stringId == STRINGID_TRAINER1WINTEXT || stringId == STRINGID_TRAINER2NAME) return TRUE; |