Game-Decompilation/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2025-03-01 10:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT 2019-11-23 19:21:31 -05:00 committed by Evan
parent 8742161431
commit 058999f49b
4 changed files with 617 additions and 617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/battle_scripts_1.s
View File

@ -3167,7 +3167,7 @@ BattleScript_RainContinuesOrEndsEnd::
end2
BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
printfromtable gSandstormHailContinuesStringIds
waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0
@ -3175,7 +3175,7 @@ BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd
printfromtable gSandStormHailDmgStringIds
printfromtable gSandstormHailDmgStringIds
waitmessage 0x40
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
effectivenesssound
@ -3193,7 +3193,7 @@ BattleScript_WeatherDamageEndedBattle::
end2
BattleScript_SandStormHailEnds::
printfromtable gSandStormHailEndStringIds
printfromtable gSandstormHailEndStringIds
waitmessage 0x40
end2

8
include/strings.h
View File

@ -187,10 +187,10 @@ extern const u8 gUnknown_84162BD[];
extern const u8 gUnknown_841D148[];
// pokemon
extern const u8 BattleText_Rose[];
extern const u8 BattleText_UnknownString3[];
extern const u8 BattleText_GetPumped[];
extern const u8 BattleText_MistShroud[];
extern const u8 gBattleText_Rose[];
extern const u8 gBattleText_UnknownString3[];
extern const u8 gBattleText_GetPumped[];
extern const u8 gBattleText_MistShroud[];
extern const u8 gText_BadEgg[];
extern const u8 gText_PkmnsXPreventsSwitching[];
extern const u8 *const gStatNamesTable[];

1212
src/battle_message.c
View File

File diff suppressed because it is too large Load Diff

8
src/pokemon.c
View File

@ -4797,8 +4797,8 @@ static void sub_8042D50(int stat)
{
gBattlerTarget = gBattlerInMenuId;
StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_825DFF0[stat]]);
StringCopy(gBattleTextBuff2, BattleText_Rose);
BattleStringExpandPlaceholdersToDisplayedString(BattleText_UnknownString3);
StringCopy(gBattleTextBuff2, gBattleText_Rose);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_UnknownString3);
}
const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)
@ -4837,7 +4837,7 @@ const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)
else
{
gBattlerAttacker = gBattlerInMenuId;
BattleStringExpandPlaceholdersToDisplayedString(BattleText_GetPumped);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_GetPumped);
}
}
}
@ -4845,7 +4845,7 @@ const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId)
if (itemEffect[3] & 0x80)
{
gBattlerAttacker = gBattlerInMenuId;
BattleStringExpandPlaceholdersToDisplayedString(BattleText_MistShroud);
BattleStringExpandPlaceholdersToDisplayedString(gBattleText_MistShroud);
}
return gDisplayedStringBattle;