summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/anim/fury_cutter_count.c6
-rw-r--r--src/battle/battle_4.c2
-rw-r--r--src/battle/battle_7.c10
-rw-r--r--src/battle/battle_anim.c4
-rw-r--r--src/battle/battle_controller_linkopponent.c14
-rw-r--r--src/battle/battle_controller_linkpartner.c22
-rw-r--r--src/battle/battle_controller_opponent.c14
-rw-r--r--src/battle/battle_controller_player.c31
-rw-r--r--src/battle/battle_controller_wally.c19
-rw-r--r--src/rom_8077ABC.c2
10 files changed, 57 insertions, 67 deletions
diff --git a/src/battle/anim/fury_cutter_count.c b/src/battle/anim/fury_cutter_count.c
index 17b084585..6b41055cb 100644
--- a/src/battle/anim/fury_cutter_count.c
+++ b/src/battle/anim/fury_cutter_count.c
@@ -1,20 +1,20 @@
#include "global.h"
+#include "battle.h"
#include "battle_anim.h"
extern s16 gBattleAnimArgs[8];
-extern u8 *gDisableStructMoveAnim; // TODO: this is declared with a different type in different files
// fury_cutter (updates the direction and count of the fury cutter animation)
// Used in Fury Cutter.
void UpdateFuryCutterAnimDirection(u8 taskId)
{
- gBattleAnimArgs[7] = gDisableStructMoveAnim[16] & 1;
+ gBattleAnimArgs[7] = gAnimDisableStructPtr->furyCutterCounter & 1;
DestroyAnimVisualTask(taskId);
}
void UpdateFuryCutterAnimCount(u8 taskId)
{
- gBattleAnimArgs[7] = gDisableStructMoveAnim[16];
+ gBattleAnimArgs[7] = gAnimDisableStructPtr->furyCutterCounter;
DestroyAnimVisualTask(taskId);
}
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 7f67abe81..0c147e471 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -14092,7 +14092,7 @@ static void atk9B_transformdataexecution(void)
gBattleMons[gBankAttacker].status2 |= STATUS2_TRANSFORMED;
gDisableStructs[gBankAttacker].disabledMove = 0;
gDisableStructs[gBankAttacker].disableTimer1 = 0;
- gDisableStructs[gBankAttacker].unk0 = gBattleMons[gBankTarget].personality;
+ gDisableStructs[gBankAttacker].transformedMonPersonality = gBattleMons[gBankTarget].personality;
gDisableStructs[gBankAttacker].unk18_b = 0;
gBattleTextBuff1[0] = 0xFD;
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 22e15d69a..7ca9ac3c4 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -28,7 +28,7 @@ extern u8 gBanksBySide[];
extern u8 gObjectBankIDs[];
extern u16 gUnknown_02024DE8;
extern u8 gDoingBattleAnim;
-extern u32 gPID_perBank[];
+extern u32 gTransformedPersonalities[];
extern struct Window gUnknown_03004210;
extern void (*gBattleBankFunc[])(void);
extern u8 gHealthboxIDs[];
@@ -276,7 +276,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b)
else
{
species = ewram17800[b].transformedSpecies;
- r7 = gPID_perBank[b];
+ r7 = gTransformedPersonalities[b];
}
otId = GetMonData(pkmn, MON_DATA_OT_ID);
var = GetBankIdentity(b);
@@ -328,7 +328,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b)
else
{
species = ewram17800[b].transformedSpecies;
- r7 = gPID_perBank[b];
+ r7 = gTransformedPersonalities[b];
}
otId = GetMonData(pkmn, MON_DATA_OT_ID);
var = GetBankIdentity(b);
@@ -659,7 +659,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
eVoidSharedArr2,
gUnknown_081FAF4C[r10],
species,
- gPID_perBank[a]);
+ gTransformedPersonalities[a]);
}
else
{
@@ -672,7 +672,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
eVoidSharedArr2,
gUnknown_081FAF4C[r10],
species,
- gPID_perBank[a]);
+ gTransformedPersonalities[a]);
}
}
src = gUnknown_081FAF4C[r10];
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 8c37e6010..8242a1ddd 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -31,7 +31,7 @@ EWRAM_DATA s8 gAnimFramesToWait = 0;
EWRAM_DATA u8 gAnimScriptActive = FALSE;
EWRAM_DATA u8 gAnimVisualTaskCount = 0;
EWRAM_DATA u8 gAnimSoundTaskCount = 0;
-EWRAM_DATA u32 gDisableStructMoveAnim = 0;
+EWRAM_DATA struct DisableStruct *gAnimDisableStructPtr = NULL;
EWRAM_DATA u32 gAnimMoveDmg = 0;
EWRAM_DATA u16 gAnimMovePower = 0;
EWRAM_DATA u8 gAnimFriendship = 0;
@@ -186,7 +186,7 @@ void ClearBattleAnimationVars(void)
gAnimScriptActive = FALSE;
gAnimVisualTaskCount = 0;
gAnimSoundTaskCount = 0;
- gDisableStructMoveAnim = 0;
+ gAnimDisableStructPtr = NULL;
gAnimMoveDmg = 0;
gAnimMovePower = 0;
gAnimFriendship = 0;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index a80a07b9f..35d8f33c8 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "battle.h"
+#include "battle_anim.h"
#include "battle_interface.h"
#include "data2.h"
#include "link.h"
@@ -17,7 +18,7 @@
#include "util.h"
#include "ewram.h"
-struct UnknownStruct3
+struct MovePpInfo
{
u16 moves[4];
u8 pp[4];
@@ -32,12 +33,11 @@ extern u8 gHealthboxIDs[];
extern u16 gBattleTypeFlags;
extern u8 gBattleMonForms[];
extern void (*gBattleBankFunc[])(void);
-extern u32 *gDisableStructMoveAnim;
extern u32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
-extern u32 gPID_perBank[];
+extern u32 gTransformedPersonalities[];
extern u8 gAnimScriptActive;
extern void (*gAnimScriptCallback)(void);
extern u8 gDisplayedStringBattle[];
@@ -596,7 +596,7 @@ void LinkOpponentHandleGetAttributes(void)
u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
{
struct BattlePokemon battlePokemon;
- struct UnknownStruct3 moveData;
+ struct MovePpInfo moveData;
u8 nickname[20];
u8 *src;
s16 data16;
@@ -925,7 +925,7 @@ void LinkOpponentHandleSetAttributes(void)
void sub_8038900(u8 a)
{
struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
- struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3];
+ struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
s32 i;
switch (gBattleBufferA[gActiveBank][1])
@@ -1341,8 +1341,8 @@ void LinkOpponentHandleMoveAnimation(void)
gAnimFriendship = gBattleBufferA[gActiveBank][10];
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
| (gBattleBufferA[gActiveBank][13] << 8);
- gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
- gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
+ gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
+ gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
// Dead code. sub_8031720 always returns 0.
if (sub_8031720(r0, gAnimMoveTurn) != 0)
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 6e63333d4..adc3c1c85 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "battle.h"
+#include "battle_anim.h"
#include "battle_interface.h"
#include "data2.h"
#include "battle_811DA74.h"
@@ -21,15 +22,7 @@
#include "util.h"
#include "ewram.h"
-struct UnknownStruct1
-{
- u8 unk0;
- u8 unk1;
- u8 unk2[0x1FE];
-};
-
-//Possibly PokemonSubstruct1
-struct UnknownStruct3
+struct MovePpInfo
{
u16 moves[4];
u8 pp[4];
@@ -47,9 +40,8 @@ extern u8 gBattleOutcome;
extern u16 gUnknown_02024DE8;
extern u8 gUnknown_02024E68[];
extern u8 gDoingBattleAnim;
-extern u32 gPID_perBank[];
+extern u32 gTransformedPersonalities[];
extern struct SpriteTemplate gUnknown_02024E8C;
-extern u32 *gDisableStructMoveAnim;
extern u32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimFriendship;
@@ -552,7 +544,7 @@ void LinkPartnerHandleGetAttributes(void)
u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
{
struct BattlePokemon battlePokemon;
- struct UnknownStruct3 moveData;
+ struct MovePpInfo moveData;
u8 nickname[20];
u8 *src;
s16 data16;
@@ -881,7 +873,7 @@ void LinkPartnerHandleSetAttributes(void)
void sub_811EC68(u8 a)
{
struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
- struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3];
+ struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
s32 i;
switch (gBattleBufferA[gActiveBank][1])
@@ -1297,8 +1289,8 @@ void LinkPartnerHandleMoveAnimation(void)
gAnimFriendship = gBattleBufferA[gActiveBank][10];
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
| (gBattleBufferA[gActiveBank][13] << 8);
- gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
- gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
+ gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
+ gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
if (sub_8031720(r0, gAnimMoveTurn) != 0)
LinkPartnerBufferExecCompleted();
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 7b693a06f..54bb9d7f9 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "battle.h"
+#include "battle_anim.h"
#include "battle_interface.h"
#include "data2.h"
#include "battle_811DA74.h"
@@ -22,7 +23,7 @@
#include "util.h"
#include "ewram.h"
-struct UnknownStruct3
+struct MovePpInfo
{
u16 moves[4];
u8 pp[4];
@@ -40,12 +41,11 @@ extern u8 gUnknown_0300434C[];
extern u8 gHealthboxIDs[];
extern u16 gBattleTypeFlags;
extern u16 gTrainerBattleOpponent;
-extern u32 *gDisableStructMoveAnim;
extern u32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
-extern u32 gPID_perBank[];
+extern u32 gTransformedPersonalities[];
extern u8 gAnimMoveTurn;
extern u8 gAnimScriptActive;
extern void (*gAnimScriptCallback)(void);
@@ -560,7 +560,7 @@ void OpponentHandleGetAttributes(void)
u32 sub_8033598(u8 a, u8 *buffer)
{
struct BattlePokemon battlePokemon;
- struct UnknownStruct3 moveData;
+ struct MovePpInfo moveData;
u8 nickname[20];
u8 *src;
s16 data16;
@@ -896,7 +896,7 @@ void OpponentHandleSetAttributes(void)
void sub_8033E24(u8 a)
{
struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
- struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3];
+ struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
s32 i;
switch (gBattleBufferA[gActiveBank][1])
@@ -1335,8 +1335,8 @@ void OpponentHandleMoveAnimation(void)
gAnimFriendship = gBattleBufferA[gActiveBank][10];
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
| (gBattleBufferA[gActiveBank][13] << 8);
- gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
- gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
+ gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
+ gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
// Dead code. sub_8031720 always returns 0.
if (sub_8031720(r0, gAnimMoveTurn) != 0)
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index cdf8b4c37..70773473d 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -1,6 +1,7 @@
#include "global.h"
#include "data2.h"
#include "battle.h"
+#include "battle_anim.h"
#include "battle_interface.h"
#include "battle_message.h"
#include "item.h"
@@ -21,8 +22,7 @@
#include "util.h"
#include "ewram.h"
-//Possibly PokemonSubstruct1
-struct UnknownStruct3
+struct MovePpInfo
{
u16 moves[4];
u8 pp[4];
@@ -60,8 +60,7 @@ extern u16 gAnimMovePower;
extern u32 gAnimMoveDmg;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
-extern u32 *gDisableStructMoveAnim;
-extern u32 gPID_perBank[];
+extern u32 gTransformedPersonalities[];
extern u8 gBattleMonForms[];
extern u16 gUnknown_02024DE8;
extern u8 gUnknown_02024E68[];
@@ -606,7 +605,7 @@ void sub_802C2EC(void)
}
}
-struct UnknownStruct1
+struct ChooseMoveStruct
{
u16 moves[4];
u8 pp[4];
@@ -621,7 +620,7 @@ const u8 gUnknown_081FAE80[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT
void sub_802C68C(void)
{
u32 r8 = 0;
- struct UnknownStruct1 *r6 = (struct UnknownStruct1 *)(gBattleBufferA[gActiveBank] + 4);
+ struct ChooseMoveStruct *r6 = (struct ChooseMoveStruct *)(gBattleBufferA[gActiveBank] + 4);
if (gMain.newKeys & A_BUTTON)
{
@@ -764,7 +763,7 @@ void sub_802CA60(void)
u8 pp[4];
u8 filler18[8]; // what is this?
} sp0;
- //struct UnknownStruct1 sp0;
+ //struct ChooseMoveStruct sp0;
u8 totalPPBonuses;
if (gMain.newKeys & (A_BUTTON | SELECT_BUTTON))
@@ -772,7 +771,7 @@ void sub_802CA60(void)
PlaySE(SE_SELECT);
if (gMoveSelectionCursor[gActiveBank] != gUnknown_03004344)
{
- struct UnknownStruct1 *r9 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
+ struct ChooseMoveStruct *r9 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
s32 i;
i = r9->moves[gMoveSelectionCursor[gActiveBank]];
@@ -1554,7 +1553,7 @@ void bx_blink_t1(void)
void sub_802E12C(s32 a, const u8 *b)
{
- struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
+ struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
StringCopy(gDisplayedStringBattle, b);
StringAppend(gDisplayedStringBattle, gMoveNames[r4->moves[a]]);
@@ -1569,7 +1568,7 @@ void sub_802E12C(s32 a, const u8 *b)
void sub_802E1B0(void)
{
- struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
+ struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
s32 i;
gUnknown_03004348 = 0;
@@ -1587,7 +1586,7 @@ void sub_802E220(void)
{
if (gBattleBufferA[gActiveBank][2] != 1)
{
- struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
+ struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
u8 *str = gDisplayedStringBattle;
str = StringCopy(str, BattleText_Format);
@@ -1619,7 +1618,7 @@ void sub_802E2D4(void)
}
else
{
- struct UnknownStruct1 *r4 = (struct UnknownStruct1 *)&gBattleBufferA[gActiveBank][4];
+ struct ChooseMoveStruct *r4 = (struct ChooseMoveStruct *)&gBattleBufferA[gActiveBank][4];
u8 *str = gDisplayedStringBattle;
str = StringCopy(str, BattleText_Format);
@@ -1731,7 +1730,7 @@ void PlayerHandleGetAttributes(void)
u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
{
struct BattlePokemon battlePokemon;
- struct UnknownStruct3 moveData;
+ struct MovePpInfo moveData;
u8 nickname[20];
u8 *src;
s16 data16;
@@ -2068,7 +2067,7 @@ void PlayerHandleSetAttributes(void)
void dp01_setattr_by_ch1_for_player_pokemon(u8 a)
{
struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
- struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3];
+ struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
s32 i;
switch (gBattleBufferA[gActiveBank][1])
@@ -2495,8 +2494,8 @@ void PlayerHandleMoveAnimation(void)
gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
gAnimFriendship = gBattleBufferA[gActiveBank][10];
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
- gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
- gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
+ gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
+ gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
if (sub_8031720(r0, gAnimMoveTurn) != 0)
{
// Dead code. sub_8031720 always returns 0.
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index e3a45825a..8ace11fc1 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "battle.h"
+#include "battle_anim.h"
#include "battle_interface.h"
#include "battle_message.h"
#include "data2.h"
@@ -19,8 +20,7 @@
#include "util.h"
#include "ewram.h"
-//Possibly PokemonSubstruct1
-struct UnknownStruct3
+struct MovePpInfo
{
u16 moves[4];
u8 pp[4];
@@ -41,8 +41,7 @@ extern u16 gAnimMovePower;
extern u32 gAnimMoveDmg;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
-extern u32 *gDisableStructMoveAnim;
-extern u32 gPID_perBank[];
+extern u32 gTransformedPersonalities[];
extern void (*gAnimScriptCallback)(void);
extern bool8 gAnimScriptActive;
extern u8 gDisplayedStringBattle[];
@@ -528,7 +527,7 @@ void WallyHandleGetAttributes(void)
u32 sub_8137A84(u8 a, u8 *buffer)
{
struct BattlePokemon battlePokemon;
- struct UnknownStruct3 moveData;
+ struct MovePpInfo moveData;
u8 nickname[20];
u8 *src;
s16 data16;
@@ -856,7 +855,7 @@ void WallyHandleSetAttributes(void)
void sub_8138294(u8 a)
{
struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
- struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3];
+ struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
s32 i;
switch (gBattleBufferA[gActiveBank][1])
@@ -1171,16 +1170,16 @@ void WallyHandlePuase(void)
void WallyHandleMoveAnimation(void)
{
- u16 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+ u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
gAnimFriendship = gBattleBufferA[gActiveBank][10];
gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
- gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
- gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
- if (sub_8031720(r0, gAnimMoveTurn) != 0)
+ gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
+ gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+ if (sub_8031720(move, gAnimMoveTurn) != 0)
{
// Dead code. sub_8031720 always returns 0.
WallyBufferExecCompleted();
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 2070ea991..cf57f8823 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -28,7 +28,7 @@
#define gBattleMonPartyPositions gBattlePartyID
#define gCastformElevations gUnknownCastformData_0837F5A8
#define gCastformBackSpriteYCoords gUnknown_0837F5AC
-#define gTransformPersonalities gPID_perBank
+#define gTransformPersonalities gTransformedPersonalities
#define gBattleMonSprites gObjectBankIDs
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 13:10:15 +0000