diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 11:59:31 -0600 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 11:59:31 -0600 |
commit | ea3a851403a675c5b36daa77270aed0f8a3a5238 (patch) | |
tree | 2db7bcf3982eab602a3710ea6c0cbb78bc777fa5 /src/battle/battle_controller_linkopponent.c | |
parent | cd2b75a677bf15756734222a9a57f0f9153fc918 (diff) |
Sync gAnimDisableStructPtr and gTransformedPersonalities with pokeemerald
Diffstat (limited to 'src/battle/battle_controller_linkopponent.c')
-rw-r--r-- | src/battle/battle_controller_linkopponent.c | 14 |
1 files changed, 7 insertions, 7 deletions
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) |