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

Merge pull request #336 from ghoulslash/master

Browse Source 
document battle_message.c
This commit is contained in:
PikalaxALT
2020-05-27 07:49:44 -04:00
committed by GitHub
parent ece62fa4ba fcb999beea
commit b7318eaa15
7 changed files with 747 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/strings.h
+14 -14
View File
@@ -188,7 +188,7 @@ extern const u8 gText_Ghost[];
// pokemon // pokemon
extern const u8 gBattleText_Rose[]; extern const u8 gBattleText_Rose[];
extern const u8 gBattleText_UnknownString3[]; extern const u8 gText_PkmnsStatChanged2[];
extern const u8 gBattleText_GetPumped[]; extern const u8 gBattleText_GetPumped[];
extern const u8 gBattleText_MistShroud[]; extern const u8 gBattleText_MistShroud[];
extern const u8 gText_BadEgg[]; extern const u8 gText_BadEgg[];
@@ -215,9 +215,9 @@ extern const u8 gString_QuitPlaying[];
extern const u8 gString_SlotMachineControls[]; extern const u8 gString_SlotMachineControls[];
// battle_controller_safari // battle_controller_safari
extern const u8 gUnknown_83FDA4C[]; extern const u8 gText_EmptyString3[];
extern const u8 gUnknown_83FE747[]; extern const u8 gUnknown_83FE747[];
extern const u8 gUnknown_83FE6E6[]; extern const u8 gText_WhatWillPlayerThrow[];
// battle_controller_player // battle_controller_player
extern const u8 gText_BattleSwitchWhich[]; extern const u8 gText_BattleSwitchWhich[];
@@ -225,23 +225,23 @@ extern const u8 gUnknown_83FE770[];
extern const u8 gText_MoveInterfacePP[]; extern const u8 gText_MoveInterfacePP[];
extern const u8 gText_MoveInterfaceType[]; extern const u8 gText_MoveInterfaceType[];
extern const u8 gText_LinkStandby[]; extern const u8 gText_LinkStandby[];
extern const u8 gUnknown_83FE725[]; extern const u8 gText_BattleMenu[];
extern const u8 gText_WhatWillPkmnDo[]; extern const u8 gText_WhatWillPkmnDo[];
// battle_script_commands // battle_script_commands
extern const u8 gText_BattleYesNoChoice[]; extern const u8 gText_BattleYesNoChoice[];
// battle_controller_oak_old_man // battle_controller_oak_old_man
extern const u8 gUnknown_83FDAE2[]; extern const u8 gText_ForPetesSake[];
extern const u8 gUnknown_83FDB92[]; extern const u8 gText_TheTrainerThat[];
extern const u8 gUnknown_83FDBEF[]; extern const u8 gText_TryBattling[];
extern const u8 gUnknown_83FDC58[]; extern const u8 gText_InflictingDamageIsKey[];
extern const u8 gUnknown_83FDC95[]; extern const u8 gText_LoweringStats[];
extern const u8 gUnknown_83FDD23[]; extern const u8 gText_KeepAnEyeOnHP[];
extern const u8 gUnknown_83FDD64[]; extern const u8 gText_OakNoRunningFromATrainer[];
extern const u8 gUnknown_83FDDEB[]; extern const u8 gText_WinEarnsPrizeMoney[];
extern const u8 gUnknown_83FDCD2[]; extern const u8 gText_HowDissapointing[];
extern const u8 gUnknown_83FE6FA[]; extern const u8 gText_WhatWillOldManDo[];
// battle_controller_pokedude // battle_controller_pokedude
extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[]; extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[];
src/battle_controller_oak_old_man.c
+12 -12
View File
@@ -645,7 +645,7 @@ static void sub_80E835C(void)
} }
break; break;
case 2: case 2:
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FDAE2); BattleStringExpandPlaceholdersToDisplayedString(gText_ForPetesSake);
BattlePutTextOnWindow(gDisplayedStringBattle, 24); BattlePutTextOnWindow(gDisplayedStringBattle, 24);
++gBattleStruct->field_94; ++gBattleStruct->field_94;
break; break;
@@ -664,7 +664,7 @@ static void sub_80E835C(void)
case 4: case 4:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FDB92); BattleStringExpandPlaceholdersToDisplayedString(gText_TheTrainerThat);
BattlePutTextOnWindow(gDisplayedStringBattle, 24); BattlePutTextOnWindow(gDisplayedStringBattle, 24);
++gBattleStruct->field_94; ++gBattleStruct->field_94;
} }
@@ -684,7 +684,7 @@ static void sub_80E835C(void)
case 6: case 6:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FDBEF); BattleStringExpandPlaceholdersToDisplayedString(gText_TryBattling);
BattlePutTextOnWindow(gDisplayedStringBattle, 24); BattlePutTextOnWindow(gDisplayedStringBattle, 24);
++gBattleStruct->field_94; ++gBattleStruct->field_94;
} }
@@ -714,27 +714,27 @@ static void sub_80E835C(void)
void sub_80E8570(void) void sub_80E8570(void)
{ {
sub_80E85D4(gUnknown_83FDC58, 1); sub_80E85D4(gText_InflictingDamageIsKey, 1);
} }
static void sub_80E8584(void) static void sub_80E8584(void)
{ {
sub_80E85D4(gUnknown_83FDC95, 64); sub_80E85D4(gText_LoweringStats, 64);
} }
void sub_80E8598(void) void sub_80E8598(void)
{ {
sub_80E85D4(gUnknown_83FDD23, 1); sub_80E85D4(gText_OakNoRunningFromATrainer, 1);
} }
static void sub_80E85AC(void) static void sub_80E85AC(void)
{ {
sub_80E85D4(gUnknown_83FDD64, 64); sub_80E85D4(gText_WinEarnsPrizeMoney, 64);
} }
void sub_80E85C0(void) void sub_80E85C0(void)
{ {
sub_80E85D4(gUnknown_83FDDEB, 64); sub_80E85D4(gText_HowDissapointing, 64);
} }
static void sub_80E85D4(const u8 *text, u8 a2) static void sub_80E85D4(const u8 *text, u8 a2)
@@ -835,7 +835,7 @@ static void sub_80E8704(void)
} }
break; break;
case 3: case 3:
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FDCD2); BattleStringExpandPlaceholdersToDisplayedString(gText_KeepAnEyeOnHP);
BattlePutTextOnWindow(gDisplayedStringBattle, 24); BattlePutTextOnWindow(gDisplayedStringBattle, 24);
++gBattleStruct->field_94; ++gBattleStruct->field_94;
break; break;
@@ -1809,15 +1809,15 @@ static void OakOldManHandleChooseAction(void)
s32 i; s32 i;
gBattlerControllerFuncs[gActiveBattler] = sub_80EA690; gBattlerControllerFuncs[gActiveBattler] = sub_80EA690;
BattlePutTextOnWindow(gUnknown_83FDA4C, 0); BattlePutTextOnWindow(gText_EmptyString3, 0);
BattlePutTextOnWindow(gUnknown_83FE725, 2); BattlePutTextOnWindow(gText_BattleMenu, 2);
for (i = 0; i < MAX_MON_MOVES; ++i) for (i = 0; i < MAX_MON_MOVES; ++i)
ActionSelectionDestroyCursorAt((u8)i); ActionSelectionDestroyCursorAt((u8)i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo);
else else
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FE6FA); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillOldManDo);
BattlePutTextOnWindow(gDisplayedStringBattle, 1); BattlePutTextOnWindow(gDisplayedStringBattle, 1);
} }
src/battle_controller_player.c
+2 -2
View File
@@ -2406,8 +2406,8 @@ static void PlayerHandleChooseAction(void)
s32 i; s32 i;
gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
BattlePutTextOnWindow(gUnknown_83FDA4C, 0); BattlePutTextOnWindow(gText_EmptyString3, 0);
BattlePutTextOnWindow(gUnknown_83FE725, 2); BattlePutTextOnWindow(gText_BattleMenu, 2);
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
ActionSelectionDestroyCursorAt(i); ActionSelectionDestroyCursorAt(i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
src/battle_controller_pokedude.c
+2 -2
View File
@@ -1928,8 +1928,8 @@ static void PokedudeHandleChooseAction(void)
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{ {
gBattlerControllerFuncs[gActiveBattler] = sub_8158B20; gBattlerControllerFuncs[gActiveBattler] = sub_8158B20;
BattlePutTextOnWindow(gUnknown_83FDA4C, 0); BattlePutTextOnWindow(gText_EmptyString3, 0);
BattlePutTextOnWindow(gUnknown_83FE725, 2); BattlePutTextOnWindow(gText_BattleMenu, 2);
for (i = 0; i < MAX_MON_MOVES; ++i) for (i = 0; i < MAX_MON_MOVES; ++i)
ActionSelectionDestroyCursorAt((u8)i); ActionSelectionDestroyCursorAt((u8)i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
src/battle_controller_safari.c
+2 -2
View File
@@ -438,12 +438,12 @@ static void SafariHandleChooseAction(void)
s32 i; s32 i;
gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
BattlePutTextOnWindow(gUnknown_83FDA4C, 0); BattlePutTextOnWindow(gText_EmptyString3, 0);
BattlePutTextOnWindow(gUnknown_83FE747, 2); BattlePutTextOnWindow(gUnknown_83FE747, 2);
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
ActionSelectionDestroyCursorAt(i); ActionSelectionDestroyCursorAt(i);
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
BattleStringExpandPlaceholdersToDisplayedString(gUnknown_83FE6E6); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPlayerThrow);
BattlePutTextOnWindow(gDisplayedStringBattle, 1); BattlePutTextOnWindow(gDisplayedStringBattle, 1);
} }
src/battle_message.c
+714 -714
View File
File diff suppressed because it is too large Load Diff
src/pokemon.c
+1 -1
View File
@@ -4819,7 +4819,7 @@ static void sub_8042D50(int stat)
gBattlerTarget = gBattlerInMenuId; gBattlerTarget = gBattlerInMenuId;
StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_825DFF0[stat]]); StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_825DFF0[stat]]);
StringCopy(gBattleTextBuff2, gBattleText_Rose); StringCopy(gBattleTextBuff2, gBattleText_Rose);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_UnknownString3); BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
} }
const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId) const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)