Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 00:32:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Polish battle_display.c (#1011)

Browse Source
This commit is contained in:
Viperio 2026-03-19 16:52:23 +01:00 committed by GitHub
parent 090a5432b5
commit 2bb4fff6c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 1675 additions and 1708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle/battle_display.h
View File

@ -127,6 +127,6 @@ PokemonSprite *BattlerData_GetPokemonSprite(BattlerData *battlerData);
Healthbar *BattlerData_GetHealthbar(BattlerData *battlerData);
UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *battlerData);
void ov16_02263B10(BattlerData *battlerData);
void ov16_02263B20(BattlerData *battlerData, int param1);
void ov16_02263B20(BattlerData *battlerData, BOOL draw);
#endif // POKEPLATINUM_BATTLE_BATTLE_DISPLAY_H

4
res/battle/scripts/subscripts/subscript_battle_won.s
View File

@ -17,7 +17,7 @@ _015:
CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_2vs2, _087
CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TAG, _087
// Player defeated {0} {1}!
PrintMessage BattleStrings_Text_PlayerDefeatedTrainerWithClass, TAG_TRCLASS_TRNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_1
PrintMessage BattleStrings_Text_PlayerDefeatedTr, TAG_TRCLASS_TRNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_1
Wait
WaitButtonABTime 15
TrainerSlideIn BTLSCR_ENEMY_SLOT_1, BATTLER_TYPE_SOLO_ENEMY
@ -43,7 +43,7 @@ _084:
_087:
// Player beat {0} {1} and {2} {3}!
PrintMessage BattleStrings_Text_PlayerBeatTrainerWithClassAndTrainerWithClass, TAG_TRCLASS_TRNAME_TRCLASS_TRNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_2, BTLSCR_ENEMY_SLOT_2
PrintMessage BattleStrings_Text_PlayerBeatTr1AndTr2, TAG_TRCLASS_TRNAME_TRCLASS_TRNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_2, BTLSCR_ENEMY_SLOT_2
Wait
WaitButtonABTime 15
TrainerSlideIn BTLSCR_ENEMY_SLOT_1, BATTLER_TYPE_SOLO_ENEMY

2
res/battle/scripts/subscripts/subscript_replace_fainted.s
View File

@ -32,7 +32,7 @@ _034:
_036:
SwitchAndUpdateMon BTLSCR_SWITCHED_MON
// {0} {1} is about to send in {2}. Will you switch your Pokémon?{YESNO 0}
PrintMessage BattleStrings_Text_OpponentIsAboutToSendInPokemonWillYouSwitchYourPokemonYesNo, TAG_TRCLASS_TRNAME_NICKNAME_TRNAME, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON, BTLSCR_PLAYER
PrintMessage BattleStrings_Text_WillYouSwitchYourPokemon, TAG_TRCLASS_TRNAME_NICKNAME_TRNAME, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON, BTLSCR_PLAYER
Wait
YesNoMenu YES_NO_CHANGE_MON
WaitYesNoResult _051, _064

2
res/battle/scripts/subscripts/subscript_throw_pokeball.s
View File

@ -3,7 +3,7 @@
_000:
// {0} used one {1}!
PrintMessage BattleStrings_Text_TrainerUsedOneItem, TAG_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
PrintMessage BattleStrings_Text_PlayerUsedOneItem, TAG_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
Wait
StartCatchMonTask CAPTURE_NORMAL
WaitCatchMonTask

2
res/battle/scripts/subscripts/subscript_throw_safari_ball.s
View File

@ -4,7 +4,7 @@
_000:
CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_PAL_PARK, _015
// {0} used one {1}!
PrintMessage BattleStrings_Text_TrainerUsedOneItem, TAG_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
PrintMessage BattleStrings_Text_PlayerUsedOneItem, TAG_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
Wait
ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_SAFARI_BALL
GoTo _023

2
res/battle/scripts/subscripts/subscript_use_guard_spec.s
View File

@ -5,7 +5,7 @@ _000:
WaitButtonABTime 15
PlaySound BTLSCR_ATTACKER, 1516
// {0} {1} used one {2}!
PrintMessage BattleStrings_Text_TrainerWithClassUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
PrintMessage BattleStrings_Text_TrUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
Wait
WaitButtonABTime 30
UseBagItem BTLSCR_ATTACKER

2
res/battle/scripts/subscripts/subscript_use_potion.s
View File

@ -5,7 +5,7 @@ _000:
WaitButtonABTime 15
PlaySound BTLSCR_ATTACKER, 1516
// {0} {1} used one {2}!
PrintMessage BattleStrings_Text_TrainerWithClassUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
PrintMessage BattleStrings_Text_TrUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
Wait
WaitButtonABTime 30
UseBagItem BTLSCR_ATTACKER

2
res/battle/scripts/subscripts/subscript_use_stat_booster.s
View File

@ -5,7 +5,7 @@ _000:
WaitButtonABTime 15
PlaySound BTLSCR_ATTACKER, 1516
// {0} {1} used one {2}!
PrintMessage BattleStrings_Text_TrainerWithClassUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
PrintMessage BattleStrings_Text_TrUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
Wait
WaitButtonABTime 30
UseBagItem BTLSCR_ATTACKER

2
res/battle/scripts/subscripts/subscript_use_status_recovery.s
View File

@ -5,7 +5,7 @@ _000:
WaitButtonABTime 15
PlaySound BTLSCR_ATTACKER, 1516
// {0} {1} used one {2}!
PrintMessage BattleStrings_Text_TrainerWithClassUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
PrintMessage BattleStrings_Text_TrUsedOneItem, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP
Wait
WaitButtonABTime 30
UseBagItem BTLSCR_ATTACKER

62
res/text/battle_strings.json
View File

@ -5455,53 +5455,53 @@
"en_US": "The wild {STRVAR_1 1, 0, 0} fled!"
},
{
"id": "BattleStrings_Text_PlayerDefeatedOpponent",
"id": "BattleStrings_Text_PlayerDefeatedLinkTr",
"en_US": [
"Player defeated\n",
"{STRVAR_1 3, 0, 0}!"
]
},
{
"id": "BattleStrings_Text_PlayerDefeatedOpponent1AndOpponent2",
"id": "BattleStrings_Text_PlayerDefeatedLinkTr1AndLinkTr2",
"en_US": [
"Player defeated {STRVAR_1 3, 0, 0}\n",
"and {STRVAR_1 3, 1, 0}!"
]
},
{
"id": "BattleStrings_Text_PlayerLostAgainstOpponent",
"id": "BattleStrings_Text_PlayerLostAgainstLinkTr",
"en_US": [
"Player lost against\n",
"{STRVAR_1 3, 0, 0}!"
]
},
{
"id": "BattleStrings_Text_PlayerLostAgainstOpponent1AndOpponent2",
"id": "BattleStrings_Text_PlayerLostAgainstLinkTr1AndLinkTr2",
"en_US": [
"Player lost to {STRVAR_1 3, 0, 0}\n",
"and {STRVAR_1 3, 1, 0}!"
]
},
{
"id": "BattleStrings_Text_PlayerBattledToADrawAgainstOpponent",
"id": "BattleStrings_Text_PlayerDrewAgainstLinkTr",
"en_US": [
"Player battled to a draw against\n",
"{STRVAR_1 3, 0, 0}!"
]
},
{
"id": "BattleStrings_Text_PlayerBattledToADrawAgainstOpponent1AndOpponent2",
"id": "BattleStrings_Text_PlayerDrewAgainstLinkTr1AndLinkTr2",
"en_US": [
"Player battled to a draw against\n",
"{STRVAR_1 3, 0, 0} and {STRVAR_1 3, 1, 0}!"
]
},
{
"id": "BattleStrings_Text_00791",
"id": "BattleStrings_Text_LinkTrFled",
"en_US": "{STRVAR_1 3, 0, 0} fled!"
},
{
"id": "BattleStrings_Text_00792",
"id": "BattleStrings_Text_LinkTr1AndLinkTr2Fled",
"en_US": [
"{STRVAR_1 3, 0, 0} and\n",
"{STRVAR_1 3, 1, 0} fled!"
@ -5718,7 +5718,7 @@
]
},
{
"id": "BattleStrings_Text_OpponentIsAboutToSendInPokemonWillYouSwitchYourPokemonYesNo",
"id": "BattleStrings_Text_WillYouSwitchYourPokemon",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0} is\n",
"about to send in {STRVAR_1 1, 2, 0}.\f",
@ -5747,7 +5747,7 @@
]
},
{
"id": "BattleStrings_Text_PlayerDefeatedTrainerWithClass",
"id": "BattleStrings_Text_PlayerDefeatedTr",
"en_US": [
"Player defeated\n",
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0}!"
@ -5853,14 +5853,14 @@
]
},
{
"id": "BattleStrings_Text_TrainerUsedOneItem",
"id": "BattleStrings_Text_PlayerUsedOneItem",
"en_US": [
"{STRVAR_1 3, 0, 0} used\n",
"one {STRVAR_1 8, 1, 0}!"
]
},
{
"id": "BattleStrings_Text_TrainerWithClassUsedOneItem",
"id": "BattleStrings_Text_TrUsedOneItem",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0}\n",
"used one {STRVAR_1 8, 2, 0}!"
@ -6421,7 +6421,7 @@
"garbage": 1
},
{
"id": "BattleStrings_Text_PlayerBeatTrainerWithClassAndTrainerWithClass",
"id": "BattleStrings_Text_PlayerBeatTr1AndTr2",
"en_US": [
"Player beat\n",
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0}\f",
@ -6507,63 +6507,63 @@
]
},
{
"id": "BattleStrings_Text_00969",
"id": "BattleStrings_Text_YouAreChallengedByTr",
"en_US": [
"You are challenged by\n",
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0}!\r"
]
},
{
"id": "BattleStrings_Text_00970",
"id": "BattleStrings_Text_YouAreChallengedByLinkTr",
"en_US": [
"You are challenged by\n",
"{STRVAR_1 3, 0, 0}!\r"
]
},
{
"id": "BattleStrings_Text_00971",
"id": "BattleStrings_Text_YouAreChallengedByLinkTr1AndLinkTr2",
"en_US": [
"You are challenged by\n",
"{STRVAR_1 3, 0, 0} and {STRVAR_1 3, 1, 0}!\r"
]
},
{
"id": "BattleStrings_Text_00972",
"id": "BattleStrings_Text_TrSentOutPokemon",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0} sent\n",
"out {STRVAR_1 1, 2, 0}!"
]
},
{
"id": "BattleStrings_Text_00973",
"id": "BattleStrings_Text_TrSentOutPokemon1AndPokemon2",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0} sent\n",
"out {STRVAR_1 1, 2, 0} and {STRVAR_1 1, 3, 0}!"
]
},
{
"id": "BattleStrings_Text_00974",
"id": "BattleStrings_Text_LinkTrSentOutPokemon",
"en_US": [
"{STRVAR_1 3, 0, 0} sent out\n",
"{STRVAR_1 1, 1, 0}!"
]
},
{
"id": "BattleStrings_Text_00975",
"id": "BattleStrings_Text_LinkTrSentOutPokemon1AndPokemon2",
"en_US": [
"{STRVAR_1 3, 0, 0} sent out\n",
"{STRVAR_1 1, 1, 0} and {STRVAR_1 1, 2, 0}!"
]
},
{
"id": "BattleStrings_Text_00976",
"id": "BattleStrings_Text_LinkTr1SentOutPokemon1LinkTr2SentOutPokemon2",
"en_US": [
"{STRVAR_1 3, 0, 0} sent out {STRVAR_1 1, 1, 0}!\n",
"{STRVAR_1 3, 2, 0} sent out {STRVAR_1 1, 3, 0}!"
]
},
{
"id": "BattleStrings_Text_00977",
"id": "BattleStrings_Text_LinkTrSentOutPokemon1GoPokemon2",
"en_US": [
"{STRVAR_1 3, 0, 0} sent out\n",
"{STRVAR_1 1, 1, 0}!\f",
@ -6571,7 +6571,7 @@
]
},
{
"id": "BattleStrings_Text_GoPokemonAndPokemon",
"id": "BattleStrings_Text_GoPokemon1AndPokemon2",
"en_US": [
"Go! {STRVAR_1 1, 0, 0} and\n",
"{STRVAR_1 1, 1, 0}!"
@ -6636,21 +6636,21 @@
]
},
{
"id": "BattleStrings_Text_00989",
"id": "BattleStrings_Text_TrWithdrewPokemon",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0}\n",
"withdrew {STRVAR_1 1, 2, 0}!"
]
},
{
"id": "BattleStrings_Text_00990",
"id": "BattleStrings_Text_LinkTrWithdrewPokemon",
"en_US": [
"{STRVAR_1 3, 0, 0} withdrew\n",
"{STRVAR_1 1, 1, 0}!"
]
},
{
"id": "BattleStrings_Text_00991",
"id": "BattleStrings_Text_Tr1SentOutPokemon1Tr2SentOutPokemon2",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0} sent\n",
"out {STRVAR_1 1, 2, 0}!\r",
@ -6659,7 +6659,7 @@
]
},
{
"id": "BattleStrings_Text_00992",
"id": "BattleStrings_Text_YouAreChallengedByTr1AndTr2",
"en_US": [
"You are challenged by\n",
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0} and\f",
@ -6667,7 +6667,7 @@
]
},
{
"id": "BattleStrings_Text_00993",
"id": "BattleStrings_Text_TrSentOutPokemon1GoPokemon2",
"en_US": [
"{STRVAR_1 14, 0, 0} {STRVAR_1 3, 1, 0} sent\n",
"out {STRVAR_1 1, 2, 0}!\f",
@ -8109,7 +8109,7 @@
]
},
{
"id": "BattleStrings_Text_PokemonsStatRose2",
"id": "BattleStrings_Text_PokemonsStatRose",
"en_US": [
"{STRVAR_1 1, 0, 0}’s\n",
"{STRVAR_1 13, 1, 0} rose!"
@ -8123,7 +8123,7 @@
]
},
{
"id": "BattleStrings_Text_PokemonIsGettingPumped2",
"id": "BattleStrings_Text_PokemonIsGettingPumped",
"en_US": [
"{STRVAR_1 1, 0, 0} is getting\n",
"pumped!"
@ -8152,7 +8152,7 @@
"en_US": "{STRVAR_1 1, 0, 0}’s burn was healed."
},
{
"id": "BattleStrings_Text_PokemonWokeUp2",
"id": "BattleStrings_Text_PokemonWokeUp",
"en_US": "{STRVAR_1 1, 0, 0} woke up."
},
{

3293
src/battle/battle_display.c
View File

File diff suppressed because it is too large Load Diff

4
src/battle/battle_io_command.c
View File

@ -112,7 +112,7 @@ static void BtlIOCmd_SubmitResult(BattleSystem *battleSys, BattlerData *battlerD
static void BtlIOCmd_ClearMessageBox(BattleSystem *battleSys, BattlerData *battlerData);
static void ZeroDataBuffer(BattlerData *battlerData);
extern const u8 Unk_ov16_0226F174[];
extern const u8 sBallThrowTypes[];
BattlerData *ov16_0225BFFC(BattleSystem *battleSys, UnkStruct_ov16_0223C2C0 *param1)
{
@ -140,7 +140,7 @@ void ov16_0225C038(BattleSystem *battleSys, BattlerData *battlerData, int ballID
return;
}
ballThrow.type = Unk_ov16_0226F174[battlerData->battlerType];
ballThrow.type = sBallThrowTypes[battlerData->battlerType];
ballThrow.heapID = HEAP_ID_BATTLE;
ballThrow.mode = 4;
ballThrow.target = battlerData->battler;

4
src/battle/battle_script.c
View File

@ -10779,7 +10779,7 @@ static void BattleScript_CatchMonTask(SysTask *task, void *inData)
ov16_0223B53C(data->battleSys);
ov16_022686BC(ov16_0223E020(data->battleSys, 0), 0);
ov16_022686BC(ov16_0223E020(data->battleSys, 1), 0);
ov16_02263B20(BattleSystem_GetBattlerData(data->battleSys, 0), 0);
ov16_02263B20(BattleSystem_GetBattlerData(data->battleSys, 0), FALSE);
v12.unk_00 = BattleSystem_GetBgConfig(data->battleSys);
v12.unk_04 = BattleSystem_GetPaletteData(data->battleSys);
@ -10831,7 +10831,7 @@ static void BattleScript_CatchMonTask(SysTask *task, void *inData)
ov12_0223783C(data->ballRotation);
PokemonSpriteManager_DeleteAll(monSpriteMan);
ov16_02263B20(BattleSystem_GetBattlerData(data->battleSys, 0), 0);
ov16_02263B20(BattleSystem_GetBattlerData(data->battleSys, 0), FALSE);
ov16_0223B53C(data->battleSys);
ov16_0223B578(data->battleSys);
Pokemon_BuildSpriteTemplate(&monSpriteTemplate, mon, 2);