From ef1f9ead0ba44c67185dccc616846646d7ce9257 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 23 Jan 2020 14:46:03 -0500 Subject: Document Trainer Tower scripts --- src/battle_message.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 5bc0f113f..196c1c3a6 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -22,6 +22,7 @@ #include "constants/moves.h" #include "constants/items.h" #include "constants/trainer_classes.h" +#include "constants/trainer_tower.h" struct BattleWindowText { @@ -1294,9 +1295,9 @@ const u8 gUnknown_83FE94D[] = _("a PSYCHIC move"); const u8 gUnknown_83FE95C[] = _("an ICE move"); const u8 gUnknown_83FE968[] = _("a DRAGON move"); const u8 gUnknown_83FE976[] = _("a DARK move"); -const u8 gUnknown_83FE982[] = _("TIME BOARD"); -const u8 gUnknown_83FE98D[] = _("CLEAR TIME"); -const u8 gUnknown_83FE998[] = _("{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC."); +const u8 gText_TimeBoard[] = _("TIME BOARD"); +const u8 gText_ClearTime[] = _("CLEAR TIME"); // Unused +const u8 gText_XMinYZSec[] = _("{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC."); const u8 gUnknown_83FE9A9[] = _("1F"); const u8 gUnknown_83FE9AC[] = _("2F"); const u8 gUnknown_83FE9AF[] = _("3F"); @@ -1306,7 +1307,7 @@ const u8 gUnknown_83FE9B8[] = _("6F"); const u8 gUnknown_83FE9BB[] = _("7F"); const u8 gUnknown_83FE9BE[] = _("8F"); -const u8 *const gUnknown_83FE9C4[] = { +const u8 *const gTrainerTowerChallengeTypeTexts[NUM_TOWER_CHALLENGE_TYPES] = { gOtherText_Single, gOtherText_Double, gOtherText_Knockout, @@ -1990,7 +1991,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = gTrainerClassNames[GetBattleTowerTrainerClassNameId()]; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) - toCpy = gTrainerClassNames[sub_815DA10()]; + toCpy = gTrainerClassNames[GetTrainerTowerOpponentClass()]; else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) toCpy = gTrainerClassNames[GetEreaderTrainerClassId()]; else @@ -2014,7 +2015,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - sub_815DA28(text); + GetTrainerTowerOpponentName(text); toCpy = text; } else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) @@ -2054,7 +2055,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_LOSE_TEXT: // trainerA lose text if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - sub_815DC40(gStringVar4, 0); + GetTrainerTowerOpponentLoseText(gStringVar4, 0); toCpy = gStringVar4; } else @@ -2065,7 +2066,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - sub_815DBF4(gStringVar4, 0); + GetTrainerTowerOpponentWinText(gStringVar4, 0); toCpy = gStringVar4; } else @@ -2074,11 +2075,11 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) } break; case B_TXT_TRAINER2_LOSE_TEXT: - sub_815DC40(gStringVar4, 1); + GetTrainerTowerOpponentLoseText(gStringVar4, 1); toCpy = gStringVar4; break; case B_TXT_TRAINER2_WIN_TEXT: - sub_815DBF4(gStringVar4, 1); + GetTrainerTowerOpponentWinText(gStringVar4, 1); toCpy = gStringVar4; break; case B_TXT_26: // ? -- cgit v1.2.3 From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/battle_message.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index d8367c75e..6ec4c3f5d 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -22,7 +22,6 @@ #include "constants/moves.h" #include "constants/items.h" #include "constants/trainer_classes.h" -#include "constants/trainer_tower.h" struct BattleWindowText { -- cgit v1.2.3 From 890d85ff029feb6509bca88ba913580c5c0cd56c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 23 Feb 2020 16:26:33 -0500 Subject: battle_bg --- src/battle_message.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_message.c') diff --git a/src/battle_message.c b/src/battle_message.c index 6ec4c3f5d..7ca47e6fb 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1271,9 +1271,9 @@ const u8 gUnknown_83FE860[] = _(" is"); const u8 gUnknown_83FE864[] = _(" is"); const u8 gText_BadEgg[] = _("Bad EGG"); const u8 gUnknown_83FE870[] = _("ミツル"); -const u8 gUnknown_83FE874[] = _("{HIGHLIGHT 0}Win"); -const u8 gUnknown_83FE87B[] = _("{HIGHLIGHT 0}Loss"); -const u8 gUnknown_83FE883[] = _("{HIGHLIGHT 0}Draw"); +const u8 gText_Win[] = _("{HIGHLIGHT 0}Win"); +const u8 gText_Loss[] = _("{HIGHLIGHT 0}Loss"); +const u8 gText_Draw[] = _("{HIGHLIGHT 0}Draw"); static const u8 sText_SpaceIs[] = _(" is"); static const u8 sText_ApostropheS[] = _("'s"); const u8 gUnknown_83FE892[] = _("a NORMAL move"); -- cgit v1.2.3