atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up

Browse source
This commit is contained in:
AlexOn1ine 2024-12-02 18:25:24 +01:00
parent 09c9d8a800
commit aa61f24e81
7 changed files with 39 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
asm/macros/battle_script.inc
View file

@ -356,7 +356,7 @@
.byte 0x3a
.endm
.macro healthbarupdate_nonmovedamage battler:req
.macro absorb battler:req
.byte 0x3b
.byte \battler
.endm
@ -1232,11 +1232,11 @@
.byte 0xe5
.endm
.macro setbattlemovedamage
.macro unused_0xE6
.byte 0xe6
.endm
.macro copybattlemovedamage
.macro unused_0xE7
.byte 0xe7
.endm

6
data/battle_scripts_1.s
View file

@ -3013,12 +3013,10 @@ BattleScript_CantMakeAsleep::
BattleScript_EffectAbsorbLiquidOoze::
call BattleScript_AbilityPopUpTarget
goto BattleScript_EffectAbsorbFromHealthBarUpdate
goto BattleScript_EffectAbsorb
BattleScript_EffectAbsorb::
playanimation BS_ATTACKER, B_ANIM_SIMPLE_HEAL
BattleScript_EffectAbsorbFromHealthBarUpdate:
healthbarupdate_nonmovedamage BS_ATTACKER
absorb BS_ATTACKER
datahpupdate BS_ATTACKER
printfromtable gAbsorbDrainStringIds
waitmessage B_WAIT_TIME_LONG

9
include/battle.h
View file

@ -840,7 +840,7 @@ struct BattleStruct
s32 calculatedCritChance[MAX_BATTLERS_COUNT];
u16 moveResultFlags[MAX_BATTLERS_COUNT];
u8 missStringId[MAX_BATTLERS_COUNT];
u8 noResultString[MAX_BATTLERS_COUNT];
u8 noResultString[MAX_BATTLERS_COUNT];
u8 doneDoublesSpreadHit:1;
u8 calculatedDamageDone:1;
u8 calculatedSpreadMoveAccuracy:1;
@ -1206,6 +1206,13 @@ static inline bool32 IsSpreadMove(u32 moveTarget)
return IsDoubleBattle() && (moveTarget == MOVE_TARGET_BOTH || moveTarget == MOVE_TARGET_FOES_AND_ALLY);
}
static inline bool32 IsDoubleSpreadMove(void)
{
return gBattleStruct->numSpreadTargets > 1
&& !(gHitMarker & (HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_UNABLE_TO_USE_MOVE))
&& IsSpreadMove(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove));
}
static inline bool32 IsBattlerInvalidForSpreadMove(u32 battlerAtk, u32 battlerDef, u32 moveTarget)
{
return battlerDef == battlerAtk

1
include/battle_util.h
View file

@ -314,7 +314,6 @@ bool8 CanMonParticipateInSkyBattle(struct Pokemon *mon);
bool8 IsMonBannedFromSkyBattles(u16 species);
void RemoveBattlerType(u32 battler, u8 type);
u32 GetMoveType(u32 move);
bool32 IsDoubleSpreadMove(void);
void ClearDamageCalcResults(void);
#endif // GUARD_BATTLE_UTIL_H

1
src/battle_main.c
View file

@ -3041,7 +3041,6 @@ static void BattleStartClearSetData(void)
gBattleStruct->AI_monToSwitchIntoId[i] = PARTY_SIZE;
gBattleStruct->skyDropTargets[i] = 0xFF;
gBattleStruct->overwrittenAbilities[i] = ABILITY_NONE;
}
gLastUsedMove = 0;

53
src/battle_script_commands.c
View file

@ -397,7 +397,7 @@ static void Cmd_bichalfword(void);
static void Cmd_bicword(void);
static void Cmd_pause(void);
static void Cmd_waitstate(void);
static void Cmd_healthbarupdate_nonmovedamage(void);
static void Cmd_absorb(void);
static void Cmd_return(void);
static void Cmd_end(void);
static void Cmd_end2(void);
@ -568,8 +568,8 @@ static void Cmd_switchoutabilities(void);
static void Cmd_jumpifhasnohp(void);
static void Cmd_jumpifnotcurrentmoveargtype(void);
static void Cmd_pickup(void);
static void Cmd_setbattlemovedamage(void);
static void Cmd_copybattlemovedamage(void);
static void Cmd_unused_0xE6(void);
static void Cmd_unused_0xE7(void);
static void Cmd_settypebasedhalvers(void);
static void Cmd_jumpifsubstituteblocks(void);
static void Cmd_tryrecycleitem(void);
@ -656,7 +656,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_bicword, //0x38
Cmd_pause, //0x39
Cmd_waitstate, //0x3A
Cmd_healthbarupdate_nonmovedamage, //0x3B
Cmd_absorb, //0x3B
Cmd_return, //0x3C
Cmd_end, //0x3D
Cmd_end2, //0x3E
@ -827,8 +827,8 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_jumpifhasnohp, //0xE3
Cmd_jumpifnotcurrentmoveargtype, //0xE4
Cmd_pickup, //0xE5
Cmd_setbattlemovedamage, //0xE6
Cmd_copybattlemovedamage, //0xE7
Cmd_unused_0xE6, //0xE6
Cmd_unused_0xE7, //0xE7
Cmd_settypebasedhalvers, //0xE8
Cmd_jumpifsubstituteblocks, //0xE9
Cmd_tryrecycleitem, //0xEA
@ -1515,7 +1515,6 @@ static bool32 JumpIfMoveAffectedByProtect(u32 move, u32 battler, u32 shouldJump)
return affected;
}
// TODO: the record ability check is wrong
static bool32 AccuracyCalcHelper(u32 move, u32 battler)
{
u32 effect = FALSE;
@ -2901,16 +2900,16 @@ static void Cmd_effectivenesssound(void)
static inline bool32 ShouldPrintTwoFoesMessage(u32 moveResult)
{
return gBattlerTarget == BATTLE_OPPOSITE(gBattlerAttacker)
&& gBattleStruct->moveResultFlags[BATTLE_PARTNER(gBattlerTarget)] & moveResult
&& !gBattleStruct->noResultString[BATTLE_PARTNER(gBattlerTarget)];
&& gBattleStruct->moveResultFlags[BATTLE_PARTNER(gBattlerTarget)] & moveResult
&& !gBattleStruct->noResultString[BATTLE_PARTNER(gBattlerTarget)];
}
static inline bool32 ShouldRelyOnTwoFoesMessage(u32 moveResult)
{
return gBattlerTarget == BATTLE_PARTNER(BATTLE_OPPOSITE(gBattlerAttacker))
&& gBattleStruct->moveResultFlags[BATTLE_OPPOSITE(gBattlerAttacker)] & moveResult
&& !(gBattleStruct->moveResultFlags[BATTLE_OPPOSITE(gBattlerAttacker)] & MOVE_RESULT_MISSED && gBattleStruct->missStringId[BATTLE_OPPOSITE(gBattlerAttacker)] > B_MSG_AVOIDED_ATK)
&& !gBattleStruct->noResultString[BATTLE_OPPOSITE(gBattlerAttacker)];
&& gBattleStruct->moveResultFlags[BATTLE_OPPOSITE(gBattlerAttacker)] & moveResult
&& !(gBattleStruct->moveResultFlags[BATTLE_OPPOSITE(gBattlerAttacker)] & MOVE_RESULT_MISSED && gBattleStruct->missStringId[BATTLE_OPPOSITE(gBattlerAttacker)] > B_MSG_AVOIDED_ATK)
&& !gBattleStruct->noResultString[BATTLE_OPPOSITE(gBattlerAttacker)];
}
static void Cmd_resultmessage(void)
@ -2951,10 +2950,10 @@ static void Cmd_resultmessage(void)
case MOVE_RESULT_SUPER_EFFECTIVE:
if (IsDoubleSpreadMove())
{
if (ShouldPrintTwoFoesMessage(MOVE_RESULT_SUPER_EFFECTIVE))
if (ShouldPrintTwoFoesMessage(MOVE_RESULT_SUPER_EFFECTIVE))
stringId = STRINGID_SUPEREFFECTIVETWOFOES;
else if (ShouldRelyOnTwoFoesMessage(MOVE_RESULT_SUPER_EFFECTIVE))
stringId = 0; // Was handled or will be handled as a double string
else if (ShouldRelyOnTwoFoesMessage(MOVE_RESULT_SUPER_EFFECTIVE))
stringId = 0; // Was handled or will be handled as a double string
else
stringId = STRINGID_SUPEREFFECTIVE;
}
@ -2969,15 +2968,15 @@ static void Cmd_resultmessage(void)
}
break;
case MOVE_RESULT_NOT_VERY_EFFECTIVE:
if (IsDoubleSpreadMove())
{
if (ShouldPrintTwoFoesMessage(MOVE_RESULT_NOT_VERY_EFFECTIVE))
stringId = STRINGID_NOTVERYEFFECTIVETWOFOES;
else if (ShouldRelyOnTwoFoesMessage(MOVE_RESULT_NOT_VERY_EFFECTIVE))
stringId = 0; // Was handled or will be handled as a double string
else
stringId = STRINGID_NOTVERYEFFECTIVE; // Needs a string
}
if (IsDoubleSpreadMove())
{
if (ShouldPrintTwoFoesMessage(MOVE_RESULT_NOT_VERY_EFFECTIVE))
stringId = STRINGID_NOTVERYEFFECTIVETWOFOES;
else if (ShouldRelyOnTwoFoesMessage(MOVE_RESULT_NOT_VERY_EFFECTIVE))
stringId = 0; // Was handled or will be handled as a double string
else
stringId = STRINGID_NOTVERYEFFECTIVE; // Needs a string
}
else if (!gMultiHitCounter)
{
stringId = STRINGID_NOTVERYEFFECTIVE;
@ -5502,7 +5501,7 @@ static void Cmd_waitstate(void)
gBattlescriptCurrInstr = cmd->nextInstr;
}
static void Cmd_healthbarupdate_nonmovedamage(void)
static void Cmd_absorb(void)
{
CMD_ARGS(u8 battler);
@ -15213,11 +15212,11 @@ static void Cmd_pickup(void)
gBattlescriptCurrInstr = cmd->nextInstr;
}
static void Cmd_setbattlemovedamage(void)
static void Cmd_unused_0xE6(void)
{
}
static void Cmd_copybattlemovedamage(void)
static void Cmd_unused_0xE7(void)
{
}

7
src/battle_util.c
View file

@ -11967,13 +11967,6 @@ u32 GetMoveType(u32 move)
return gMovesInfo[move].type;
}
bool32 IsDoubleSpreadMove(void)
{
return gBattleStruct->numSpreadTargets > 1
&& !(gHitMarker & (HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_UNABLE_TO_USE_MOVE))
&& IsSpreadMove(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove));
}
void ClearDamageCalcResults(void)
{
for (u32 battler = 0; battler < MAX_BATTLERS_COUNT; battler++)