Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move battle state into gBattleStruct and categorize #2704

Draft
wants to merge 95 commits into
base: upcoming
Choose a base branch
from
Draft

Move battle state into gBattleStruct and categorize #2704

wants to merge 95 commits into from
+1,537 −1,568

Conversation

mrgriffin
Copy link
Collaborator

Collects the various battle state variables and arranges them under gBattleStruct members field, sides[i], sides[i].party[j], and battlers[i].

Currently a draft because the work is ongoing.

@mrgriffin
Introduce gBattleStruct->{field,sides,battlers}
d5b7d51
@mrgriffin
wrappedMove[i] => battlers[i].wrappedMove
f5776fa
@mrgriffin
wrappedBy[i] => battlers[i].wrappedBy
4220a70
@mrgriffin
moveTarget[i] => battlers[i].moveTarget
a9609ef
@mrgriffin
selectionScriptFinished[i] => battlers[i].selectionScriptFinished
826d8cb
@mrgriffin
battlerPartyIndexes[i] => battlers[i].partyIndex
40fe8ce
@mrgriffin
monToSwitchIntoId[i] => battlers[i].monToSwitchIntoIndex
6e1405f
@mrgriffin
chosenMovePositions[i] => battlers[i].chosenMovePosition
d65ad54
@mrgriffin
stateIdAfterSelScript[i] => battlers[i].stateAfterSelectionScript
cda3737
@mrgriffin
lastTakenMove[i] => battlers[i].lastTakenMove
d38bb55
@mrgriffin
hpOnSwitchout[i] => sides[i].hpOnSwitchout
c3084d6
@mrgriffin
usedHeldItems[i][s] => sides[s].party[i].usedHeldItem
d288f04
@mrgriffin
chosenItem[i] => battlers[i].chosenItem
e1f9b2b
@mrgriffin
choicedMove[i] => battlers[i].choicedMove
ea4db30
@mrgriffin
changedItems[i] => battlers[i].changedItem
6d8fcb2
@mrgriffin
lastTakenMoveFrom[t][a] => battlers[t].lastTakenMoveFrom[a]
0d758de
@mrgriffin
roostTypes[b][i] => battlers[b].roostTypes[i]
8c56b9d
@mrgriffin
ateBoost[i] => battlers[i].ateBoost
3277477
@mrgriffin
ateBerry[i] (1 << j) => sides[i].party[j].ateBerry
5bd1b68 
sides[i] is computed incorrectly as (battlerId & BIT_SIDE) instead of
GetBattlerSide(battlerId). This will cause errors in link battles.
@mrgriffin
lastMoveFailed (1 << i) => battlers[i].lastMoveFailed
97546af
@mrgriffin
lastMoveTarget[i] => battlers[i].lastMoveTarget
956f9b5
@mrgriffin
debugHoldEffects[i] => battlers[i].debugHoldEffect
de11730
@mrgriffin
tracedAbility[i] => battlers[i].tracedAbility
4e06d73
@mrgriffin
hpBefore[i] => battlers[i].hpBeforeMove
8c05d89
@mrgriffin
illusion[i] => battlers[i].illusion
b943978
@mrgriffin
sameMoveTurns[i] => battlers[i].sameMoveTurns
8354655
@mrgriffin
changedSpecies[i] => sides[s].party[i].changedSpecies
c2d220e
@mrgriffin
itemStolen[i].{stolen,originalItem} => sides[s].party[i].{itemStolen,…
82126f5 
…originalItem}
@mrgriffin
skyDropTargets[i] => battlers[i].skyDropTarget
f95ccd2
@mrgriffin
targetsDone[i] => battlers[i].targetsDone
8c894ca
@mrgriffin
gDisableStructs[i].protectUses => battlers[i].protectUses
fb4c690
@mrgriffin
gDisableStructs[i].stockpile{Counter,Def,SpDef,BeforeDef,BeforeSpDef}…
958fd38 
… => battlers[i].stockpile{Counter,Def,SpDef,BeforeDef,BeforeSpDef}
@mrgriffin
gDisableStructs[i].substituteHP => battlers[i].substituteHP
e7955c8
@mrgriffin
gDisableStructs[i].encoredMovePos => gBattleStruct->battlers[i].encor…
68c3b85 
…edMovePosition
@mrgriffin
gDisableStructs[i].encoreTimer => battlers[i].encoreTimer
0b2688d
@mrgriffin
gDisableStructs[i].disableTimer => battlers[i].disableTimer
86f57d3
@mrgriffin
gDisableStructs[i].perishSongTimer => battlers[i].perishSongTimer
e3552dc
@mrgriffin
gDisableStructs[i].tauntTimer => battlers[i].tauntTimer
7ac44cd
@mrgriffin
gDisableStructs[i].battlerPreventingEscape => battlers[i].battlerPrev…
c9d22d9 
…entingEscape
@mrgriffin
gDisableStructs[i].battlerWithSureHit => battlers[i].battlerWithSureHit
6108105
@mrgriffin
gDisableStructs[i].isFirstTurn => battlers[i].isFirstTurn
105d0e2
@mrgriffin
gDisableStructs[i].truant{Counter,SwitchInHack} => battlers[i].truant…
8196721 
…{Counter,SwitchInHack}
@mrgriffin
gDisableStructs[i].mimickedMoves => battlers[i].mimickedMoves
b395c99
@mrgriffin
gDisableStructs[i].rechargeTimer => battlers[i].rechargeTimer
e677f10
@mrgriffin
gDisableStructs[i].autotomizeCount => battlers[i].autotomizeCount
be4f493
@mrgriffin
gDisableStructs[i].slowStartTimer => battlers[i].slowStartTimer
65656aa
@mrgriffin
gDisableStructs[i].embargoTimer => battlers[i].embargoTimer
9c0d125
@mrgriffin
gDisableStructs[i].magnetRiseTimer => battlers[i].magnetRiseTimer
195ffa7
@mrgriffin
gDisableStructs[i].telekinesisTimer => battlers[i].telekinesisTimer
b64301c
@mrgriffin
gDisableStructs[i].laserFocusTimer => battlers[i].laserFocusTimer
95ab4bd
@mrgriffin
gDisableStructs[i].throatChopTimer => battlers[i].throatChopTimer
2984a1c
@mrgriffin
gDisableStructs[i].wrapTurns => battlers[i].wrapTurns
67dfa33
@mrgriffin
gDisableStructs[i].usedMoves => battlers[i].usedMoves
45afc87
@mrgriffin
gDisableStructs[i].noRetreat => battlers[i].noRetreat
c4ea9c4
@mrgriffin
gDisableStructs[i].tarShot => battlers[i].tarShot
c7418b9
@mrgriffin
gDisableStructs[i].octolock => battlers[i].octolock
d8fdf24
@mrgriffin
gDisableStructs[i].cudChew => battlers[i].cudChew
a9dba63
@AsparagusEduardo AsparagusEduardo mentioned this pull request Nov 9, 2023
Merged
@hedara90 hedara90 added type: data Changes focus on data type: cleanup labels Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
type: cleanup type: data Changes focus on data
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mrgriffin @hedara90