ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert mega related struct fields to a seperate struct

Browse Source
This commit is contained in:
DizzyEggg 2018-09-20 17:33:27 +02:00
parent 13e434f874
commit 2bae70a66b
6 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/battle.h
View File

@ -478,6 +478,19 @@ struct BattleTvMovePoints
s16 points[2][PARTY_SIZE * 4]; s16 points[2][PARTY_SIZE * 4];
}; };
struct MegaEvolutionData
{
u8 toEvolve; // As flags using gBitTable.
u8 evolvedPartyIds[2]; // As flags using gBitTable;
bool8 alreadyEvolved[4]; // Array id is used for mon position.
u16 evolvedSpecies[MAX_BATTLERS_COUNT];
u16 playerEvolvedSpecies;
u8 battlerId;
bool8 playerSelect;
u8 triggerSpriteId;
u8 indicatorSpriteIds[MAX_BATTLERS_COUNT];
};
struct BattleStruct struct BattleStruct
{ {
u8 turnEffectsTracker; u8 turnEffectsTracker;
@ -598,15 +611,7 @@ struct BattleStruct
bool8 ateBoost[MAX_BATTLERS_COUNT]; bool8 ateBoost[MAX_BATTLERS_COUNT];
u32 debugAIFlags; u32 debugAIFlags;
bool8 notfirstTimeAIFlags; bool8 notfirstTimeAIFlags;
u8 toMegaEvolve; // As flags using gBitTable. struct MegaEvolutionData mega;
u8 megaEvolvedPartyIds[2]; // As flags using gBitTable;
bool8 alreadyMegaEvolved[4]; // Array id is used for mon position.
u16 speciesThatMegaEvolved[MAX_BATTLERS_COUNT];
u16 playerSpeciesThatMegaEvolved;
u8 megaEvoBattlerId;
bool8 playerMegaEvoSelect;
u8 megaEvoTriggerSpriteId;
u8 megaEvoIndicatorSpriteId[MAX_BATTLERS_COUNT];
}; };
#define GET_MOVE_TYPE(move, typeArg) \ #define GET_MOVE_TYPE(move, typeArg) \

14
src/battle_controller_player.c
View File

@ -386,7 +386,7 @@ static void HandleInputChooseTarget(void)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C; gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
if (gBattleStruct->playerMegaEvoSelect) if (gBattleStruct->mega.playerSelect)
BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | RET_MEGA_EVOLUTION | (gMultiUsePlayerCursor << 8)); BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | RET_MEGA_EVOLUTION | (gMultiUsePlayerCursor << 8));
else else
BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8)); BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
@ -544,7 +544,7 @@ static void HandleInputChooseMove(void)
if (!canSelectTarget) if (!canSelectTarget)
{ {
if (gBattleStruct->playerMegaEvoSelect) if (gBattleStruct->mega.playerSelect)
BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | RET_MEGA_EVOLUTION | (gMultiUsePlayerCursor << 8)); BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | RET_MEGA_EVOLUTION | (gMultiUsePlayerCursor << 8));
else else
BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8)); BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
@ -568,7 +568,7 @@ static void HandleInputChooseMove(void)
else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59) else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gBattleStruct->playerMegaEvoSelect = FALSE; gBattleStruct->mega.playerSelect = FALSE;
BtlController_EmitTwoReturnValues(1, 10, 0xFFFF); BtlController_EmitTwoReturnValues(1, 10, 0xFFFF);
HideMegaTriggerSprite(); HideMegaTriggerSprite();
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
@ -643,8 +643,8 @@ static void HandleInputChooseMove(void)
{ {
if (CanMegaEvolve(gActiveBattler)) if (CanMegaEvolve(gActiveBattler))
{ {
gBattleStruct->playerMegaEvoSelect ^= 1; gBattleStruct->mega.playerSelect ^= 1;
SetMegaTriggerSpritePal(gBattleStruct->megaEvoTriggerSpriteId, gBattleStruct->playerMegaEvoSelect); SetMegaTriggerSpritePal(gBattleStruct->mega.triggerSpriteId, gBattleStruct->mega.playerSelect);
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
} }
} }
@ -2646,9 +2646,9 @@ static void PlayerHandleChooseMove(void)
else else
{ {
InitMoveSelectionsVarsAndStrings(); InitMoveSelectionsVarsAndStrings();
gBattleStruct->playerMegaEvoSelect = FALSE; gBattleStruct->mega.playerSelect = FALSE;
if (!IsMegaTriggerSpriteActive()) if (!IsMegaTriggerSpriteActive())
gBattleStruct->megaEvoTriggerSpriteId = 0xFF; gBattleStruct->mega.triggerSpriteId = 0xFF;
if (CanMegaEvolve(gActiveBattler)) if (CanMegaEvolve(gActiveBattler))
CreateMegaTriggerSprite(gActiveBattler, 0); CreateMegaTriggerSprite(gActiveBattler, 0);
gBattlerControllerFuncs[gActiveBattler] = HandleChooseMoveAfterDma3; gBattlerControllerFuncs[gActiveBattler] = HandleChooseMoveAfterDma3;

18
src/battle_interface.c
View File

@ -1561,16 +1561,16 @@ void CreateMegaTriggerSprite(u8 battlerId, u8 palId)
{ {
if (GetSpriteTileStartByTag(TAG_MEGA_TRIGGER_TILE) == 0xFFFF) if (GetSpriteTileStartByTag(TAG_MEGA_TRIGGER_TILE) == 0xFFFF)
LoadSpriteSheet(&sSpriteSheet_MegaTrigger); LoadSpriteSheet(&sSpriteSheet_MegaTrigger);
if (gBattleStruct->megaEvoTriggerSpriteId == 0xFF) if (gBattleStruct->mega.triggerSpriteId == 0xFF)
{ {
gBattleStruct->megaEvoTriggerSpriteId = CreateSprite(&sSpriteTemplate_MegaTrigger, gBattleStruct->mega.triggerSpriteId = CreateSprite(&sSpriteTemplate_MegaTrigger,
gSprites[gHealthboxSpriteIds[battlerId]].pos1.x, gSprites[gHealthboxSpriteIds[battlerId]].pos1.x,
gSprites[gHealthboxSpriteIds[battlerId]].pos1.y - MEGA_TRIGGER_POS_Y_DIFF, 0); gSprites[gHealthboxSpriteIds[battlerId]].pos1.y - MEGA_TRIGGER_POS_Y_DIFF, 0);
} }
gSprites[gBattleStruct->megaEvoTriggerSpriteId].tBattler = battlerId; gSprites[gBattleStruct->mega.triggerSpriteId].tBattler = battlerId;
gSprites[gBattleStruct->megaEvoTriggerSpriteId].tHide = FALSE; gSprites[gBattleStruct->mega.triggerSpriteId].tHide = FALSE;
SetMegaTriggerSpritePal(gBattleStruct->megaEvoTriggerSpriteId, palId); SetMegaTriggerSpritePal(gBattleStruct->mega.triggerSpriteId, palId);
} }
static void SpriteCb_MegaTrigger(struct Sprite *sprite) static void SpriteCb_MegaTrigger(struct Sprite *sprite)
@ -1612,7 +1612,7 @@ bool32 IsMegaTriggerSpriteActive(void)
void HideMegaTriggerSprite(void) void HideMegaTriggerSprite(void)
{ {
gSprites[gBattleStruct->megaEvoTriggerSpriteId].tHide = TRUE; gSprites[gBattleStruct->mega.triggerSpriteId].tHide = TRUE;
} }
void DestroyMegaTriggerSprite(void) void DestroyMegaTriggerSprite(void)
@ -1620,9 +1620,9 @@ void DestroyMegaTriggerSprite(void)
FreeSpritePaletteByTag(TAG_MEGA_TRIGGER_OFF_PAL); FreeSpritePaletteByTag(TAG_MEGA_TRIGGER_OFF_PAL);
FreeSpritePaletteByTag(TAG_MEGA_TRIGGER_ON_PAL); FreeSpritePaletteByTag(TAG_MEGA_TRIGGER_ON_PAL);
FreeSpriteTilesByTag(TAG_MEGA_TRIGGER_TILE); FreeSpriteTilesByTag(TAG_MEGA_TRIGGER_TILE);
if (gBattleStruct->megaEvoTriggerSpriteId != 0xFF) if (gBattleStruct->mega.triggerSpriteId != 0xFF)
DestroySprite(&gSprites[gBattleStruct->megaEvoTriggerSpriteId]); DestroySprite(&gSprites[gBattleStruct->mega.triggerSpriteId]);
gBattleStruct->megaEvoTriggerSpriteId = 0xFF; gBattleStruct->mega.triggerSpriteId = 0xFF;
} }
#undef tBattler #undef tBattler

22
src/battle_main.c
View File

@ -3099,9 +3099,9 @@ static void BattleStartClearSetData(void)
gBattleStruct->field_2A0 = 0; gBattleStruct->field_2A0 = 0;
gBattleStruct->field_2A1 = 0; gBattleStruct->field_2A1 = 0;
gBattleStruct->megaEvoTriggerSpriteId = 0xFF; gBattleStruct->mega.triggerSpriteId = 0xFF;
for (i = 0; i < MAX_BATTLERS_COUNT; i++) for (i = 0; i < MAX_BATTLERS_COUNT; i++)
gBattleStruct->megaEvoIndicatorSpriteId[i] = 0xFF; gBattleStruct->mega.indicatorSpriteIds[i] = 0xFF;
} }
void SwitchInClearSetData(void) void SwitchInClearSetData(void)
@ -4339,7 +4339,7 @@ static void HandleTurnActionSelectionState(void)
RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 3); RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 3);
} }
gBattleStruct->toMegaEvolve &= ~(gBitTable[BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))]); gBattleStruct->mega.toEvolve &= ~(gBitTable[BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))]);
BtlController_EmitEndBounceEffect(0); BtlController_EmitEndBounceEffect(0);
MarkBattlerForControllerExec(gActiveBattler); MarkBattlerForControllerExec(gActiveBattler);
return; return;
@ -4429,7 +4429,7 @@ static void HandleTurnActionSelectionState(void)
gChosenMoveByBattler[gActiveBattler] = gBattleMons[gActiveBattler].moves[*(gBattleStruct->chosenMovePositions + gActiveBattler)]; gChosenMoveByBattler[gActiveBattler] = gBattleMons[gActiveBattler].moves[*(gBattleStruct->chosenMovePositions + gActiveBattler)];
*(gBattleStruct->moveTarget + gActiveBattler) = gBattleBufferB[gActiveBattler][3]; *(gBattleStruct->moveTarget + gActiveBattler) = gBattleBufferB[gActiveBattler][3];
if (gBattleBufferB[gActiveBattler][2] & RET_MEGA_EVOLUTION) if (gBattleBufferB[gActiveBattler][2] & RET_MEGA_EVOLUTION)
gBattleStruct->toMegaEvolve |= gBitTable[gActiveBattler]; gBattleStruct->mega.toEvolve |= gBitTable[gActiveBattler];
gBattleCommunication[gActiveBattler]++; gBattleCommunication[gActiveBattler]++;
} }
break; break;
@ -4856,7 +4856,7 @@ static void SetActionsAndBattlersTurnOrder(void)
} }
} }
gBattleMainFunc = CheckMegaEvolutionBeforeTurn; gBattleMainFunc = CheckMegaEvolutionBeforeTurn;
gBattleStruct->megaEvoBattlerId = 0; gBattleStruct->mega.battlerId = 0;
return; return;
} }
else else
@ -4898,7 +4898,7 @@ static void SetActionsAndBattlersTurnOrder(void)
} }
} }
gBattleMainFunc = CheckMegaEvolutionBeforeTurn; gBattleMainFunc = CheckMegaEvolutionBeforeTurn;
gBattleStruct->megaEvoBattlerId = 0; gBattleStruct->mega.battlerId = 0;
} }
static void TurnValuesCleanUp(bool8 var0) static void TurnValuesCleanUp(bool8 var0)
@ -4954,14 +4954,14 @@ static void CheckMegaEvolutionBeforeTurn(void)
{ {
if (!(gHitMarker & HITMARKER_RUN)) if (!(gHitMarker & HITMARKER_RUN))
{ {
while (gBattleStruct->megaEvoBattlerId < gBattlersCount) while (gBattleStruct->mega.battlerId < gBattlersCount)
{ {
gActiveBattler = gBattlerAttacker = gBattleStruct->megaEvoBattlerId; gActiveBattler = gBattlerAttacker = gBattleStruct->mega.battlerId;
gBattleStruct->megaEvoBattlerId++; gBattleStruct->mega.battlerId++;
if (gBattleStruct->toMegaEvolve & gBitTable[gActiveBattler] if (gBattleStruct->mega.toEvolve & gBitTable[gActiveBattler]
&& !(gProtectStructs[gActiveBattler].noValidMoves)) && !(gProtectStructs[gActiveBattler].noValidMoves))
{ {
gBattleStruct->toMegaEvolve &= ~(gBitTable[gActiveBattler]); gBattleStruct->mega.toEvolve &= ~(gBitTable[gActiveBattler]);
gLastUsedItem = gBattleMons[gActiveBattler].item; gLastUsedItem = gBattleMons[gActiveBattler].item;
BattleScriptExecute(BattleScript_MegaEvolution); BattleScriptExecute(BattleScript_MegaEvolution);
return; return;

10
src/battle_script_commands.c
View File

@ -6595,14 +6595,14 @@ static void atk76_various(void)
else else
mon = &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]; mon = &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]];
gBattleStruct->speciesThatMegaEvolved[gActiveBattler] = gBattleMons[gActiveBattler].species; gBattleStruct->mega.evolvedSpecies[gActiveBattler] = gBattleMons[gActiveBattler].species;
if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT
|| (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT && !(gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER)))) || (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT && !(gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER))))
{ {
gBattleStruct->playerSpeciesThatMegaEvolved = gBattleStruct->speciesThatMegaEvolved[gActiveBattler]; gBattleStruct->mega.playerEvolvedSpecies = gBattleStruct->mega.evolvedSpecies[gActiveBattler];
} }
gBattleMons[gActiveBattler].species = GetMegaEvolutionSpecies(gBattleStruct->speciesThatMegaEvolved[gActiveBattler], gBattleMons[gActiveBattler].item); gBattleMons[gActiveBattler].species = GetMegaEvolutionSpecies(gBattleStruct->mega.evolvedSpecies[gActiveBattler], gBattleMons[gActiveBattler].item);
SetMonData(mon, MON_DATA_SPECIES, &gBattleMons[gActiveBattler].species); SetMonData(mon, MON_DATA_SPECIES, &gBattleMons[gActiveBattler].species);
PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gActiveBattler].species); PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gActiveBattler].species);
@ -6620,8 +6620,8 @@ static void atk76_various(void)
gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2; gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], mon, HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], mon, HEALTHBOX_ALL);
gBattleStruct->alreadyMegaEvolved[GetBattlerPosition(gActiveBattler)] = TRUE; gBattleStruct->mega.alreadyEvolved[GetBattlerPosition(gActiveBattler)] = TRUE;
gBattleStruct->megaEvolvedPartyIds[GetBattlerSide(gActiveBattler)] |= gBitTable[gBattlerPartyIndexes[gActiveBattler]]; gBattleStruct->mega.evolvedPartyIds[GetBattlerSide(gActiveBattler)] |= gBitTable[gBattlerPartyIndexes[gActiveBattler]];
BtlController_EmitSetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlerPartyIndexes[gActiveBattler]], sizeof(struct BattlePokemon), &gBattleMons[gActiveBattler]); BtlController_EmitSetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlerPartyIndexes[gActiveBattler]], sizeof(struct BattlePokemon), &gBattleMons[gActiveBattler]);
MarkBattlerForControllerExec(gActiveBattler); MarkBattlerForControllerExec(gActiveBattler);

10
src/battle_util.c
View File

@ -5607,12 +5607,12 @@ bool32 CanMegaEvolve(u8 battlerId)
u8 partnerPosition = GetBattlerPosition(BATTLE_PARTNER(battlerId)); u8 partnerPosition = GetBattlerPosition(BATTLE_PARTNER(battlerId));
// Check if trainer already mega evolved a pokemon. // Check if trainer already mega evolved a pokemon.
if (gBattleStruct->alreadyMegaEvolved[battlerPosition]) if (gBattleStruct->mega.alreadyEvolved[battlerPosition])
return FALSE; return FALSE;
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{ {
if (IsPartnerMonFromSameTrainer(battlerId) if (IsPartnerMonFromSameTrainer(battlerId)
&& (gBattleStruct->alreadyMegaEvolved[partnerPosition] || (gBattleStruct->toMegaEvolve & gBitTable[BATTLE_PARTNER(battlerId)]))) && (gBattleStruct->mega.alreadyEvolved[partnerPosition] || (gBattleStruct->mega.toEvolve & gBitTable[BATTLE_PARTNER(battlerId)])))
return FALSE; return FALSE;
} }
@ -5641,10 +5641,10 @@ bool32 CanMegaEvolve(u8 battlerId)
void UndoMegaEvolution(u8 monId) void UndoMegaEvolution(u8 monId)
{ {
if (gBattleStruct->megaEvolvedPartyIds[B_SIDE_PLAYER] & gBitTable[monId]) if (gBattleStruct->mega.evolvedPartyIds[B_SIDE_PLAYER] & gBitTable[monId])
{ {
gBattleStruct->megaEvolvedPartyIds[B_SIDE_PLAYER] &= ~(gBitTable[monId]); gBattleStruct->mega.evolvedPartyIds[B_SIDE_PLAYER] &= ~(gBitTable[monId]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleStruct->playerSpeciesThatMegaEvolved); SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleStruct->mega.playerEvolvedSpecies);
CalculateMonStats(&gPlayerParty[monId]); CalculateMonStats(&gPlayerParty[monId]);
} }
} }