Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge 2804c9ee1d into c47809abcd

Browse Source
This commit is contained in:
GGbond 2026-03-21 08:02:48 +01:00 committed by GitHub
commit bf2893e460
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle_script_commands.c
View File

@ -8612,8 +8612,9 @@ static void Cmd_transformdataexecution(void)
else
{
s32 i;
u8 *battleMonAttacker, *battleMonTarget;
u8 timesGotHit;
struct BattlePokemon *battleMonAttacker;
struct BattlePokemon *battleMonTarget;
gBattleMons[gBattlerAttacker].volatiles.transformed = TRUE;
gBattleMons[gBattlerAttacker].volatiles.disabledMove = MOVE_NONE;
@ -8633,11 +8634,11 @@ static void Cmd_transformdataexecution(void)
PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species)
battleMonAttacker = (u8 *)(&gBattleMons[gBattlerAttacker]);
battleMonTarget = (u8 *)(&gBattleMons[gBattlerTarget]);
battleMonAttacker = &gBattleMons[gBattlerAttacker];
battleMonTarget = &gBattleMons[gBattlerTarget];
for (i = 0; i < offsetof(struct BattlePokemon, pp); i++)
battleMonAttacker[i] = battleMonTarget[i];
// Fields before pp are copied by Transform. Keep new transformable fields above pp.
memcpy(battleMonAttacker, battleMonTarget, offsetof(struct BattlePokemon, pp));
gBattleMons[gBattlerAttacker].volatiles.overwrittenAbility = GetBattlerAbility(gBattlerTarget);
for (i = 0; i < MAX_MON_MOVES; i++)