dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #544 from GriffinRichards/fix-b-msg

Browse Source 
Fix battle message charmap copied from emerald
This commit is contained in:
GriffinR
2022-09-01 23:08:21 -04:00
committed by GitHub
parent 7c0b46f6da 17a8498701
commit a30ea109c1
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charmap.txt
+3 -7
View File
@@ -406,13 +406,9 @@ B_ATK_PREFIX2 = FD 2A
B_DEF_PREFIX2 = FD 2B B_DEF_PREFIX2 = FD 2B
B_ATK_PREFIX3 = FD 2C B_ATK_PREFIX3 = FD 2C
B_DEF_PREFIX3 = FD 2D B_DEF_PREFIX3 = FD 2D
B_TRAINER2_CLASS = FD 2E B_TRAINER2_LOSE_TEXT = FD 2E
B_TRAINER2_NAME = FD 2F B_TRAINER2_WIN_TEXT = FD 2F
B_TRAINER2_LOSE_TEXT = FD 30 B_BUFF3 = FD 30
B_TRAINER2_WIN_TEXT = FD 31
B_PARTNER_CLASS = FD 32
B_PARTNER_NAME = FD 33
B_BUFF3 = FD 34
@ indicates the end of a town/city name (before " TOWN" or " CITY") @ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00 NAME_END = FC 00
data/battle_scripts_1.s
+2 -2
View File
@@ -2977,7 +2977,7 @@ BattleScript_BattleTowerLostLostSkipMonRecall::
waitstate waitstate
printstring STRINGID_TRAINER1WINTEXT printstring STRINGID_TRAINER1WINTEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerLostLostSkipDouble jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerLostLostSkipDouble
printstring STRINGID_TRAINER2NAME printstring STRINGID_TRAINER2WINTEXT
BattleScript_BattleTowerLostLostSkipDouble:: BattleScript_BattleTowerLostLostSkipDouble::
end2 end2
@@ -2995,7 +2995,7 @@ BattleScript_BattleTowerTrainerBattleWon::
jumpifnotbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerEtcTrainerBattleWonSkipText jumpifnotbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
printstring STRINGID_TRAINER1LOSETEXT printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerEtcTrainerBattleWonSkipText jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
printstring STRINGID_TRAINER2CLASS printstring STRINGID_TRAINER2LOSETEXT
BattleScript_BattleTowerEtcTrainerBattleWonSkipText:: BattleScript_BattleTowerEtcTrainerBattleWonSkipText::
pickup pickup
end2 end2
include/constants/battle_string_ids.h
+2 -2
View File
@@ -373,8 +373,8 @@
#define STRINGID_POKEFLUTECATCHY 372 #define STRINGID_POKEFLUTECATCHY 372
#define STRINGID_POKEFLUTE 373 #define STRINGID_POKEFLUTE 373
#define STRINGID_MONHEARINGFLUTEAWOKE 374 #define STRINGID_MONHEARINGFLUTEAWOKE 374
#define STRINGID_TRAINER2CLASS 375 #define STRINGID_TRAINER2LOSETEXT 375
#define STRINGID_TRAINER2NAME 376 #define STRINGID_TRAINER2WINTEXT 376
#define STRINGID_PLAYERWHITEDOUT 377 #define STRINGID_PLAYERWHITEDOUT 377
#define STRINGID_MONTOOSCAREDTOMOVE 378 #define STRINGID_MONTOOSCAREDTOMOVE 378
#define STRINGID_GHOSTGETOUTGETOUT 379 #define STRINGID_GHOSTGETOUTGETOUT 379
src/battle_message.c
+9 -6
View File
@@ -44,13 +44,13 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst);
static const u8 sText_Empty1[] = _(""); static const u8 sText_Empty1[] = _("");
static const u8 sText_Trainer1LoseText[] = _("{B_TRAINER1_LOSE_TEXT}"); static const u8 sText_Trainer1LoseText[] = _("{B_TRAINER1_LOSE_TEXT}");
static const u8 sText_Trainer2Class[] = _("{B_TRAINER2_CLASS}"); static const u8 sText_Trainer2LoseText[] = _("{B_TRAINER2_LOSE_TEXT}");
static const u8 sText_Trainer1RecallPkmn1[] = _("{B_TRAINER1_NAME}: {B_OPPONENT_MON1_NAME}, come back!"); static const u8 sText_Trainer1RecallPkmn1[] = _("{B_TRAINER1_NAME}: {B_OPPONENT_MON1_NAME}, come back!");
static const u8 sText_Trainer1WinText[] = _("{B_TRAINER1_WIN_TEXT}"); static const u8 sText_Trainer1WinText[] = _("{B_TRAINER1_WIN_TEXT}");
static const u8 sText_Trainer1RecallPkmn2[] = _("{B_TRAINER1_NAME}: {B_OPPONENT_MON2_NAME}, come back!"); static const u8 sText_Trainer1RecallPkmn2[] = _("{B_TRAINER1_NAME}: {B_OPPONENT_MON2_NAME}, come back!");
static const u8 sText_Trainer1RecallBoth[] = _("{B_TRAINER1_NAME}: {B_OPPONENT_MON1_NAME} and\n{B_OPPONENT_MON2_NAME}, come back!"); static const u8 sText_Trainer1RecallBoth[] = _("{B_TRAINER1_NAME}: {B_OPPONENT_MON1_NAME} and\n{B_OPPONENT_MON2_NAME}, come back!");
static const u8 sText_Trainer2Name[] = _("{B_TRAINER2_NAME}"); static const u8 sText_Trainer2WinText[] = _("{B_TRAINER2_WIN_TEXT}");
static const u8 sText_PkmnGainedEXP[] = _("{B_BUFF1} gained{B_BUFF2}\n{B_TRAINER2_LOSE_TEXT} EXP. Points!\p"); static const u8 sText_PkmnGainedEXP[] = _("{B_BUFF1} gained{B_BUFF2}\n{B_BUFF3} EXP. Points!\p");
static const u8 sText_EmptyString4[] = _(""); static const u8 sText_EmptyString4[] = _("");
static const u8 sText_ABoosted[] = _(" a boosted"); static const u8 sText_ABoosted[] = _(" a boosted");
static const u8 sText_PkmnGrewToLv[] = _("{B_BUFF1} grew to\nLV. {B_BUFF2}!{WAIT_SE}\p"); static const u8 sText_PkmnGrewToLv[] = _("{B_BUFF1} grew to\nLV. {B_BUFF2}!{WAIT_SE}\p");
@@ -878,8 +878,8 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT - BATTLESTRINGS_TABLE_ST
[STRINGID_POKEFLUTECATCHY - BATTLESTRINGS_TABLE_START] = sText_PlayedFluteCatchyTune, [STRINGID_POKEFLUTECATCHY - BATTLESTRINGS_TABLE_START] = sText_PlayedFluteCatchyTune,
[STRINGID_POKEFLUTE - BATTLESTRINGS_TABLE_START] = sText_PlayedThe, [STRINGID_POKEFLUTE - BATTLESTRINGS_TABLE_START] = sText_PlayedThe,
[STRINGID_MONHEARINGFLUTEAWOKE - BATTLESTRINGS_TABLE_START] = sText_PkmnHearingFluteAwoke, [STRINGID_MONHEARINGFLUTEAWOKE - BATTLESTRINGS_TABLE_START] = sText_PkmnHearingFluteAwoke,
[STRINGID_TRAINER2CLASS - BATTLESTRINGS_TABLE_START] = sText_Trainer2Class, [STRINGID_TRAINER2LOSETEXT - BATTLESTRINGS_TABLE_START] = sText_Trainer2LoseText,
[STRINGID_TRAINER2NAME - BATTLESTRINGS_TABLE_START] = sText_Trainer2Name, [STRINGID_TRAINER2WINTEXT - BATTLESTRINGS_TABLE_START] = sText_Trainer2WinText,
[STRINGID_PLAYERWHITEDOUT - BATTLESTRINGS_TABLE_START] = sText_PlayerWhiteout2, [STRINGID_PLAYERWHITEDOUT - BATTLESTRINGS_TABLE_START] = sText_PlayerWhiteout2,
[STRINGID_MONTOOSCAREDTOMOVE - BATTLESTRINGS_TABLE_START] = sText_TooScaredToMove, [STRINGID_MONTOOSCAREDTOMOVE - BATTLESTRINGS_TABLE_START] = sText_TooScaredToMove,
[STRINGID_GHOSTGETOUTGETOUT - BATTLESTRINGS_TABLE_START] = sText_GetOutGetOut, [STRINGID_GHOSTGETOUTGETOUT - BATTLESTRINGS_TABLE_START] = sText_GetOutGetOut,
@@ -2805,7 +2805,10 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) {
bool8 BattleStringShouldBeColored(u16 stringId) bool8 BattleStringShouldBeColored(u16 stringId)
{ {
if (stringId == STRINGID_TRAINER1LOSETEXT || stringId == STRINGID_TRAINER2CLASS || stringId == STRINGID_TRAINER1WINTEXT || stringId == STRINGID_TRAINER2NAME) if (stringId == STRINGID_TRAINER1LOSETEXT
|| stringId == STRINGID_TRAINER2LOSETEXT
|| stringId == STRINGID_TRAINER1WINTEXT
|| stringId == STRINGID_TRAINER2WINTEXT)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }