From dc273cc19d842e8831548a1342af857aae2886c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 26 Oct 2018 23:54:41 +0200 Subject: Battle tower - ewram variables --- src/battle_message.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index a5f549733..99ab8bbd6 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -18,6 +18,8 @@ #include "recorded_battle.h" #include "international_string_util.h" #include "battle_frontier_2.h" +#include "battle_tower.h" +#include "data2.h" struct BattleWindowText { @@ -35,7 +37,6 @@ struct BattleWindowText extern u8 gUnknown_0203C7B4; -extern const u8 gMoveNames[MOVES_COUNT][13]; extern const u8 gTrainerClassNames[][13]; extern const u16 gUnknown_08D85620[]; @@ -46,14 +47,10 @@ extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[]; extern u8 GetFrontierBrainTrainerClass(void); // battle_frontier_2 -extern u8 GetFrontierOpponentClass(u16 trainerId); // battle_tower extern u8 GetTrainerHillOpponentClass(u16 trainerId); // pokenav -extern u8 GetEreaderTrainerClassId(void); // battle_tower extern void CopyFrontierBrainTrainerName(u8 *txtPtr); // battle_frontier_2 extern void GetTrainerHillTrainerName(u8 *txtPtr, u16 trainerId); // pokenav -extern void GetEreaderTrainerName(u8 *txtPtr); extern void CopyTrainerHillTrainerText(u8 arg0, u16 trainerId); // pokenav -extern void GetFrontierTrainerName(u8 *dst, u16 trainerId); // this file's functions static void ChooseMoveUsedParticle(u8 *textPtr); -- cgit v1.2.3 From e85051712361063b04aa7a35ff5c25aed068cab9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 21:01:35 +0200 Subject: more battle frontier 2 --- src/battle_message.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 99ab8bbd6..147d0295f 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2579,7 +2579,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - CopyFrontierTrainerText(FRONTIER_LOSE_TEXT, gTrainerBattleOpponent_A); + CopyFrontierTrainerText(FRONTIER_PLAYER_WON_TEXT, gTrainerBattleOpponent_A); toCpy = gStringVar4; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) @@ -2595,7 +2595,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - CopyFrontierTrainerText(FRONTIER_WIN_TEXT, gTrainerBattleOpponent_A); + CopyFrontierTrainerText(FRONTIER_PLAYER_LOST_TEXT, gTrainerBattleOpponent_A); toCpy = gStringVar4; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) @@ -2676,7 +2676,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER2_LOSE_TEXT: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - CopyFrontierTrainerText(FRONTIER_LOSE_TEXT, gTrainerBattleOpponent_B); + CopyFrontierTrainerText(FRONTIER_PLAYER_WON_TEXT, gTrainerBattleOpponent_B); toCpy = gStringVar4; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) @@ -2692,7 +2692,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER2_WIN_TEXT: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - CopyFrontierTrainerText(FRONTIER_WIN_TEXT, gTrainerBattleOpponent_B); + CopyFrontierTrainerText(FRONTIER_PLAYER_LOST_TEXT, gTrainerBattleOpponent_B); toCpy = gStringVar4; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL) -- cgit v1.2.3 From 7de1c4bd141bc793873b12acd7f1eaae7474bfbc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 30 Oct 2018 22:17:03 +0100 Subject: Make frontier util compile --- src/battle_message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 147d0295f..837f3e6d3 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -17,7 +17,7 @@ #include "menu.h" #include "recorded_battle.h" #include "international_string_util.h" -#include "battle_frontier_2.h" +#include "frontier_util.h" #include "battle_tower.h" #include "data2.h" -- cgit v1.2.3 From 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 10:44:48 -0600 Subject: Begin cleaning text.c --- src/battle_message.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 99ab8bbd6..018848218 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2938,7 +2938,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) { const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType]; bool32 copyToVram; - struct TextSubPrinter textSubPrinter; + struct TextPrinterTemplate printerTemplate; u8 speed; if (windowId & 0x80) @@ -2952,25 +2952,25 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) copyToVram = TRUE; } - textSubPrinter.current_text_offset = text; - textSubPrinter.windowId = windowId; - textSubPrinter.fontId = textInfo[windowId].fontId; - textSubPrinter.x = textInfo[windowId].x; - textSubPrinter.y = textInfo[windowId].y; - textSubPrinter.currentX = textSubPrinter.x; - textSubPrinter.currentY = textSubPrinter.y; - textSubPrinter.letterSpacing = textInfo[windowId].letterSpacing; - textSubPrinter.lineSpacing = textInfo[windowId].lineSpacing; - textSubPrinter.fontColor_l = 0; - textSubPrinter.fgColor = textInfo[windowId].fgColor; - textSubPrinter.bgColor = textInfo[windowId].bgColor; - textSubPrinter.shadowColor = textInfo[windowId].shadowColor; - - if (textSubPrinter.x == 0xFF) + printerTemplate.currentChar = text; + printerTemplate.windowId = windowId; + printerTemplate.fontId = textInfo[windowId].fontId; + printerTemplate.x = textInfo[windowId].x; + printerTemplate.y = textInfo[windowId].y; + printerTemplate.currentX = printerTemplate.x; + printerTemplate.currentY = printerTemplate.y; + printerTemplate.letterSpacing = textInfo[windowId].letterSpacing; + printerTemplate.lineSpacing = textInfo[windowId].lineSpacing; + printerTemplate.fontColor_l = 0; + printerTemplate.fgColor = textInfo[windowId].fgColor; + printerTemplate.bgColor = textInfo[windowId].bgColor; + printerTemplate.shadowColor = textInfo[windowId].shadowColor; + + if (printerTemplate.x == 0xFF) { u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); - s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(textSubPrinter.fontId, textSubPrinter.current_text_offset, width, textSubPrinter.letterSpacing); - textSubPrinter.x = textSubPrinter.currentX = alignX; + s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing); + printerTemplate.x = printerTemplate.currentX = alignX; } if (windowId == 0x16) @@ -2992,15 +2992,15 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) else speed = GetPlayerTextSpeed(); - gTextFlags.flag_0 = 1; + gTextFlags.canABSpeedUpPrint = 1; } else { speed = textInfo[windowId].speed; - gTextFlags.flag_0 = 0; + gTextFlags.canABSpeedUpPrint = 0; } - AddTextPrinter(&textSubPrinter, speed, NULL); + AddTextPrinter(&printerTemplate, speed, NULL); if (copyToVram) { -- cgit v1.2.3 From f8d337e491f531285f6067e2e7f39a8d606036d6 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 11:30:21 -0600 Subject: Finish cleaning up text.c --- src/battle_message.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 018848218..3b4ad0c21 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2961,7 +2961,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.currentY = printerTemplate.y; printerTemplate.letterSpacing = textInfo[windowId].letterSpacing; printerTemplate.lineSpacing = textInfo[windowId].lineSpacing; - printerTemplate.fontColor_l = 0; + printerTemplate.unk = 0; printerTemplate.fgColor = textInfo[windowId].fgColor; printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; @@ -2974,14 +2974,14 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) } if (windowId == 0x16) - gTextFlags.flag_1 = 0; + gTextFlags.useAlternateDownArrow = 0; else - gTextFlags.flag_1 = 1; + gTextFlags.useAlternateDownArrow = 1; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED)) - gTextFlags.flag_2 = 1; + gTextFlags.autoScroll = 1; else - gTextFlags.flag_2 = 0; + gTextFlags.autoScroll = 0; if (windowId == 0 || windowId == 0x16) { @@ -2990,7 +2990,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) speed = sRecordedBattleTextSpeeds[GetTextSpeedInRecordedBattle()]; else - speed = GetPlayerTextSpeed(); + speed = GetPlayerTextSpeedDelay(); gTextFlags.canABSpeedUpPrint = 1; } -- cgit v1.2.3