Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

pmd-sky function renames

Browse Source
This commit is contained in:
DizzyEggg 2025-10-31 15:53:07 +01:00
parent 0e9c298e88
commit a90c95dd8a
8 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/move_orb_effects_1.h
View File

@ -28,10 +28,10 @@ void IngrainedStatusTarget(Entity * pokemon, Entity * target);
void WrapTarget(Entity * pokemon, Entity * target);
void sub_8076CB4(s32 param_1);
void PetrifiedStatusTarget(Entity * pokemon, Entity * target);
void LowerOffensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat, s32 decrement, u8 param_5, bool8 displayMessage);
void LowerDefensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat, s32 nStages, bool8 checkProtected, bool8 logMsgProtected);
void RaiseAttackStageTarget(Entity * pokemon, Entity * target, struct StatIndex stat, s32 increment);
void RaiseDefenseStageTarget(Entity * pokemon, Entity * target, struct StatIndex stat, s32 increment);
void LowerOffensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 decrement, u8 param_5, bool8 displayMessage);
void LowerDefensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 nStages, bool8 checkProtected, bool8 logMsgProtected);
void BoostOffensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 increment);
void BoostDefensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 increment);
u8 GetFlashFireStatus(Entity *pokemon);
void UpdateFlashFireBoost(Entity * pokemon, Entity *target);
void ChangeAttackMultiplierTarget(Entity *pokemon, Entity *target, struct StatIndex stat, s24_8 param_4, bool8 displayMessage);

2
src/dungeon_damage.c
View File

@ -97,7 +97,7 @@ void HandleDealingDamage(Entity *attacker, Entity *target, struct DamageStruct *
}
if (GetEntInfo(target)->bideClassStatus.status == STATUS_ENRAGED) {
RaiseAttackStageTarget(attacker, target, gStatIndexAtkDef, 1);
BoostOffensiveStat(attacker, target, gStatIndexAtkDef, 1);
}
if (!EntityIsValid(attacker) || !EntityIsValid(target))

20
src/move_orb_actions_1.c
View File

@ -300,7 +300,7 @@ bool8 StringShotMoveAction(Entity *pokemon, Entity *target, Move *move, s32 item
bool8 SwaggerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
ConfuseStatusTarget(pokemon, target, TRUE);
RaiseAttackStageTarget(pokemon, target, gStatIndexAtkDef, 2);
BoostOffensiveStat(pokemon, target, gStatIndexAtkDef, 2);
return TRUE;
}
@ -482,7 +482,7 @@ bool8 OctazookaMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemI
bool8 FlatterMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
ConfuseStatusTarget(pokemon, target, TRUE);
RaiseAttackStageTarget(pokemon, target, gStatIndexSpecial, 1);
BoostOffensiveStat(pokemon, target, gStatIndexSpecial, 1);
return TRUE;
}
@ -617,7 +617,7 @@ bool8 GustMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
// NOTE: Is there a better name for this?
bool8 BasicRaiseDefenseMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseDefenseStageTarget(pokemon, target, gStatIndexAtkDef, 1);
BoostDefensiveStat(pokemon, target, gStatIndexAtkDef, 1);
return TRUE;
}
@ -630,7 +630,7 @@ bool8 DisableMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
// NOTE: Is there a better name for this?
bool8 BasicRaiseAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon, target, gStatIndexAtkDef, 1);
BoostOffensiveStat(pokemon, target, gStatIndexAtkDef, 1);
return TRUE;
}
@ -936,10 +936,10 @@ bool8 AncientPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 it
{
entityInfo = GetEntInfo(pokemon);
RaiseMovementSpeedTarget(pokemon, pokemon, 0, TRUE);
RaiseAttackStageTarget(pokemon, pokemon, gStatIndexAtkDef, 1);
RaiseAttackStageTarget(pokemon, pokemon, gStatIndexSpecial, 1);
RaiseDefenseStageTarget(pokemon, pokemon, gStatIndexAtkDef, 1);
RaiseDefenseStageTarget(pokemon, pokemon, gStatIndexSpecial, 1);
BoostOffensiveStat(pokemon, pokemon, gStatIndexAtkDef, 1);
BoostOffensiveStat(pokemon, pokemon, gStatIndexSpecial, 1);
BoostDefensiveStat(pokemon, pokemon, gStatIndexAtkDef, 1);
BoostDefensiveStat(pokemon, pokemon, gStatIndexSpecial, 1);
SetExpMultplier(entityInfo);
}
}
@ -980,7 +980,7 @@ bool8 SureShotMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId
bool8 CosmicPowerMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseDefenseStageTarget(pokemon, target, gStatIndexAtkDef, 1);
RaiseDefenseStageTarget(pokemon, target, gStatIndexSpecial, 1);
BoostDefensiveStat(pokemon, target, gStatIndexAtkDef, 1);
BoostDefensiveStat(pokemon, target, gStatIndexSpecial, 1);
return TRUE;
}

12
src/move_orb_actions_2.c
View File

@ -89,7 +89,7 @@ bool8 MeteorMashMoveAction(Entity *pokemon, Entity *target, Move *move, s32 item
if(sub_805727C(pokemon, pokemon, gMeteorMashSecondaryChance))
{
entityInfo = GetEntInfo(pokemon);
RaiseAttackStageTarget(pokemon, pokemon, gStatIndexAtkDef, 1);
BoostOffensiveStat(pokemon, pokemon, gStatIndexAtkDef, 1);
SetExpMultplier(entityInfo);
}
}
@ -558,7 +558,7 @@ bool8 SmogMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
bool8 GrowthMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon, target, gStatIndexSpecial, 1);
BoostOffensiveStat(pokemon, target, gStatIndexSpecial, 1);
return TRUE;
}
@ -789,7 +789,7 @@ bool8 HornDrillMoveAction(Entity * pokemon,Entity * target,Move * move,s32 itemI
bool8 SwordsDanceMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon, target, gStatIndexAtkDef, 2);
BoostOffensiveStat(pokemon, target, gStatIndexAtkDef, 2);
return TRUE;
}
@ -852,8 +852,8 @@ bool8 HelpingHandMoveAction(Entity *pokemon, Entity *target, Move *move, s32 ite
TryDisplayDungeonLoggableMessage3(target, target, gUnknown_80FEB60);
}
else {
RaiseAttackStageTarget(pokemon, target, gStatIndexAtkDef, 1);
RaiseAttackStageTarget(pokemon, target, gStatIndexSpecial, 1);
BoostOffensiveStat(pokemon, target, gStatIndexAtkDef, 1);
BoostOffensiveStat(pokemon, target, gStatIndexSpecial, 1);
flag = TRUE;
}
return flag;
@ -861,7 +861,7 @@ bool8 HelpingHandMoveAction(Entity *pokemon, Entity *target, Move *move, s32 ite
bool8 sub_8059CD8(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseDefenseStageTarget(pokemon, target, gStatIndexAtkDef, 2);
BoostDefensiveStat(pokemon, target, gStatIndexAtkDef, 2);
return TRUE;
}

12
src/move_orb_actions_3.c
View File

@ -273,7 +273,7 @@ bool8 ThiefMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
bool8 AmnesiaMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseDefenseStageTarget(pokemon, target, gStatIndexSpecial, 2);
BoostDefensiveStat(pokemon, target, gStatIndexSpecial, 2);
return TRUE;
}
@ -460,7 +460,7 @@ bool8 SteelWingMoveAction(Entity *pokemon, Entity *target, Move *move, struct St
flag = TRUE;
if (sub_805727C(pokemon,pokemon,gSteelWingSecondaryChance) != 0) {
entityInfo = GetEntInfo(pokemon);
RaiseDefenseStageTarget(pokemon,pokemon,stat,1);
BoostDefensiveStat(pokemon,pokemon,stat,1);
SetExpMultplier(entityInfo);
}
}
@ -673,7 +673,7 @@ bool8 BellyDrumMoveAction(Entity * pokemon,Entity * target, Move *move, s32 item
info = GetEntInfo(pokemon);
flag = FALSE;
if (FixedPointToInt(info->belly) > 1) {
RaiseAttackStageTarget(pokemon,target,gStatIndexAtkDef,99);
BoostOffensiveStat(pokemon,target,gStatIndexAtkDef,99);
info->belly = IntToFixedPoint(1);
flag = TRUE;
}
@ -749,8 +749,8 @@ bool8 sub_805AC90(Entity * pokemon, Entity * target, Move *move, s32 itemId)
bool8 BulkUpMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon, target, gStatIndexAtkDef, 1);
RaiseDefenseStageTarget(pokemon, target, gStatIndexAtkDef, 1);
BoostOffensiveStat(pokemon, target, gStatIndexAtkDef, 1);
BoostDefensiveStat(pokemon, target, gStatIndexAtkDef, 1);
return TRUE;
}
@ -961,7 +961,7 @@ bool8 HandleColorChange(Entity * pokemon, Entity * target, Move *move, s32 itemI
bool8 TailGlowMoveAction(Entity * pokemon, Entity * target, Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon,target,gStatIndexSpecial, 2);
BoostOffensiveStat(pokemon,target,gStatIndexSpecial, 2);
return TRUE;
}

10
src/move_orb_actions_4.c
View File

@ -59,7 +59,7 @@ bool8 ProtectMoveAction(Entity * pokemon,Entity * target,Move *move, s32 itemId)
bool8 DefenseCurlMoveAction(Entity * pokemon,Entity * target,Move *move, s32 itemId)
{
RaiseDefenseStageTarget(pokemon,target,gStatIndexAtkDef,1);
BoostDefensiveStat(pokemon,target,gStatIndexAtkDef,1);
return TRUE;
}
@ -102,8 +102,8 @@ bool8 MirrorCoatMoveAction(Entity * pokemon,Entity * target,Move *move, s32 item
bool8 CalmMindMoveAction(Entity * pokemon,Entity * target,Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon,target,gStatIndexSpecial,1);
RaiseDefenseStageTarget(pokemon,target,gStatIndexSpecial,1);
BoostOffensiveStat(pokemon,target,gStatIndexSpecial,1);
BoostDefensiveStat(pokemon,target,gStatIndexSpecial,1);
return TRUE;
}
@ -123,7 +123,7 @@ bool8 MetalClawMoveAction(Entity * pokemon,Entity * target,Move *move, struct St
flag = TRUE;
if (sub_805727C(pokemon,pokemon,gMetalClawSecondaryChance) != 0) {
entityInfo = GetEntInfo(pokemon);
RaiseAttackStageTarget(pokemon,pokemon,stat,1);
BoostOffensiveStat(pokemon,pokemon,stat,1);
SetExpMultplier(entityInfo);
}
}
@ -305,7 +305,7 @@ bool8 DragonRageMoveAction(Entity * pokemon, Entity * target, Move *move, s32 it
bool8 DragonDanceMoveAction( Entity * pokemon, Entity * target, Move *move, s32 itemId)
{
RaiseAttackStageTarget(pokemon, target, gStatIndexAtkDef, 1);
BoostOffensiveStat(pokemon, target, gStatIndexAtkDef, 1);
RaiseMovementSpeedTarget(pokemon, target, 0, TRUE);
return TRUE;
}

74
src/move_orb_effects_1.c
View File

@ -851,7 +851,7 @@ void PetrifiedStatusTarget(Entity * pokemon, Entity * target)
}
}
void LowerOffensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat, s32 nStages, u8 checkProtected, bool8 logMsgProtected)
void LowerOffensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 nStages, u8 checkProtected, bool8 logMsgProtected)
{
EntityInfo *entityInfo;
s32 newStage;
@ -867,18 +867,18 @@ void LowerOffensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat
}
if (checkProtected) {
if (IsProtectedFromStatDrops(pokemon,target,logMsgProtected))
if (IsProtectedFromStatDrops(user,target,logMsgProtected))
return;
if (HasHeldItem(target, ITEM_TWIST_BAND)) {
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],target,0);
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FD550);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FD550);
return;
}
if (AbilityIsActive(target, ABILITY_HYPER_CUTTER) && stat.id == STAT_INDEX_PHYSICAL) {
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],target,0);
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FCA60);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FCA60);
return;
}
}
@ -901,16 +901,16 @@ void LowerOffensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat
if (entityInfo->offensiveStages[stat.id] != newStage) {
entityInfo->offensiveStages[stat.id] = newStage;
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC15C);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC15C);
}
else {
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC274);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC274);
}
EntityUpdateStatusSprites(target);
}
void LowerDefensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat, s32 nStages, bool8 checkProtected, bool8 logMsgProtected)
void LowerDefensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 nStages, bool8 checkProtected, bool8 logMsgProtected)
{
EntityInfo *entityInfo;
s32 newStage;
@ -926,7 +926,7 @@ void LowerDefensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat
}
if (checkProtected) {
if (IsProtectedFromStatDrops(pokemon,target,logMsgProtected))
if (IsProtectedFromStatDrops(user,target,logMsgProtected))
return;
}
@ -948,23 +948,23 @@ void LowerDefensiveStat(Entity * pokemon, Entity * target, struct StatIndex stat
if (entityInfo->defensiveStages[stat.id] != newStage) {
entityInfo->defensiveStages[stat.id] = newStage;
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC158);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC158);
}
else {
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC248);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC248);
}
EntityUpdateStatusSprites(target);
}
void RaiseAttackStageTarget(Entity * pokemon, Entity * target, struct StatIndex stat, s32 increment)
void BoostOffensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 nStages)
{
EntityInfo *entityInfo;
s32 attackStage = increment;
s32 newStage;
if (!EntityIsValid(target)) {
if (!EntityIsValid(target))
return;
}
entityInfo = GetEntInfo(target);
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],target,0);
sub_8041F70(target,stat);
@ -975,36 +975,37 @@ void RaiseAttackStageTarget(Entity * pokemon, Entity * target, struct StatIndex
strcpy(gFormatBuffer_Items[0],gUnknown_80FC0B8);
}
if (increment == 1) {
if (nStages == 1) {
strcpy(gFormatBuffer_Items[1],gUnknown_80FC0E4);
}
else {
strcpy(gFormatBuffer_Items[1],gUnknown_80FC0D4);
}
attackStage = entityInfo->offensiveStages[stat.id];
attackStage = attackStage + increment;
if (attackStage >= MAX_STAT_STAGE) {
attackStage = MAX_STAT_STAGE;
newStage = entityInfo->offensiveStages[stat.id];
newStage += nStages;
if (newStage >= MAX_STAT_STAGE) {
newStage = MAX_STAT_STAGE;
}
if (entityInfo->offensiveStages[stat.id] != attackStage) {
entityInfo->offensiveStages[stat.id] = attackStage;
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC13C);
if (entityInfo->offensiveStages[stat.id] != newStage) {
entityInfo->offensiveStages[stat.id] = newStage;
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC13C);
}
else {
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC270);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC270);
}
EntityUpdateStatusSprites(target);
}
void RaiseDefenseStageTarget(Entity * pokemon, Entity * target, struct StatIndex stat, s32 increment)
void BoostDefensiveStat(Entity * user, Entity * target, struct StatIndex stat, s32 nStages)
{
EntityInfo *entityInfo;
s32 defenseStage = increment;
s32 newStage;
if (!EntityIsValid(target)) {
if (!EntityIsValid(target))
return;
}
entityInfo = GetEntInfo(target);
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0],target,0);
sub_8041F94(target,stat);
@ -1015,24 +1016,25 @@ void RaiseDefenseStageTarget(Entity * pokemon, Entity * target, struct StatIndex
strcpy(gFormatBuffer_Items[0],gUnknown_80FC09C);
}
if (increment == 1) {
if (nStages == 1) {
strcpy(gFormatBuffer_Items[1],gUnknown_80FC0E4);
}
else {
strcpy(gFormatBuffer_Items[1],gUnknown_80FC0D4);
}
defenseStage = entityInfo->defensiveStages[stat.id];
defenseStage = defenseStage + increment;
if (defenseStage >= MAX_STAT_STAGE) {
defenseStage = MAX_STAT_STAGE;
newStage = entityInfo->defensiveStages[stat.id];
newStage += nStages;
if (newStage >= MAX_STAT_STAGE) {
newStage = MAX_STAT_STAGE;
}
if (entityInfo->defensiveStages[stat.id] != defenseStage) {
entityInfo->defensiveStages[stat.id] = defenseStage;
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC138);
if (entityInfo->defensiveStages[stat.id] != newStage) {
entityInfo->defensiveStages[stat.id] = newStage;
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC138);
}
else {
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FC21C);
TryDisplayDungeonLoggableMessage3(user,target,gUnknown_80FC21C);
}
EntityUpdateStatusSprites(target);
}

4
src/move_orb_effects_2.c
View File

@ -523,8 +523,8 @@ void CurseStatusTarget(Entity *pokemon, Entity * target)
TryDisplayDungeonLoggableMessage3(pokemon,target,gUnknown_80FB004);
}
else {
RaiseAttackStageTarget(pokemon,pokemon,gStatIndexAtkDef,1);
RaiseDefenseStageTarget(pokemon,pokemon,gStatIndexAtkDef,1);
BoostOffensiveStat(pokemon,pokemon,gStatIndexAtkDef,1);
BoostDefensiveStat(pokemon,pokemon,gStatIndexAtkDef,1);
LowerMovementSpeedTarget(pokemon,pokemon,1,TRUE);
}
EntityUpdateStatusSprites(target);