diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-30 10:32:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-30 10:32:08 -0400 |
| commit | 6444d169853a93d23140cb36b687da9c4ea00dea (patch) | |
| tree | 072c67bbbaa0b239be5e95c55559f294d46b34d7 /include | |
| parent | fe2897c8a49579e6aac147d5d365b7fa6c6cdb72 (diff) | |
Expand battle struct access macros inline
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 9 | ||||
| -rw-r--r-- | include/ewram.h | 16 |
2 files changed, 3 insertions, 22 deletions
diff --git a/include/battle.h b/include/battle.h index a320c2de7..ca772adc3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -306,14 +306,11 @@ struct BattleStruct /* 0x2000000 */ /*0x16003*/ u8 scriptingActive; /*0x16004*/ u8 wrappedMove[MAX_BATTLERS_COUNT * 2]; /*0x1600C*/ u8 cmd49StateTracker; - /*0x1600D*/ u8 unk1600D; + /*0x1600D*/ u8 unk1600D; // unused /*0x1600E*/ u8 turnCountersTracker; /*0x1600F*/ u8 getexpStateTracker; /*0x16010*/ u8 moveTarget[MAX_BATTLERS_COUNT]; - /*0x16014*/ u8 unk16014; - /*0x16015*/ u8 unk16015; - /*0x16016*/ u8 unk16016; - /*0x16017*/ u8 unk16017; + /*0x16014*/ u32 unk16014; /*0x16018*/ u8 expGetterMonId; /*0x16019*/ u8 unk16019; /*0x1601A*/ u8 atk5A_StateTracker; //also atk5B, statetracker @@ -402,7 +399,7 @@ struct BattleStruct /* 0x2000000 */ /*0x160FD*/ u8 unk160FD; /*0x160FE*/ u8 unk160FE; /*0x160FF*/ u8 unk160FF; - /*0x16100*/ u8 lastTakenMoveFrom[2 * 2 * 4]; + /*0x16100*/ u16 lastTakenMoveFrom[2 * 4]; /*0x16110*/ u8 wishPerishSongState; /*0x16111*/ u8 wishPerishSongBattlerId; /*0x16112*/ u8 multihitMoveEffect; diff --git a/include/ewram.h b/include/ewram.h index 0f5abd9c7..d5e1f8ba9 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -91,34 +91,18 @@ extern u8 gSharedMem[]; // there's a ton of filler. #define BSTRUCT_OFF(member) (offsetof(struct BattleStruct, member) + ((u8 *)gBattleStruct - gSharedMem)) -#define ewram16004arr(i, battler) (gSharedMem[BSTRUCT_OFF(wrappedMove) + i + battler * 2]) -#define ewram16010arr(battler) (gSharedMem[BSTRUCT_OFF(moveTarget) + battler]) -#define ewram16020arr(i) (gSharedMem[BSTRUCT_OFF(wrappedBy) + i]) #define ewram16060(battler) (gSharedMem[BSTRUCT_OFF(unk16060) + battler]) #define BATTLE_PARTY_ID(battler) (gSharedMem[BSTRUCT_OFF(unk16064) + battler]) #define ewram16068arr(i) (gSharedMem[BSTRUCT_OFF(monToSwitchIntoId) + i]) #define ewram1606Carr(i, a) (gSharedMem[BSTRUCT_OFF(unk1606C) + i + a * 3]) -#define ewram1608Carr(battler) (gSharedMem[BSTRUCT_OFF(ChosenMoveID) + battler]) #define ewram16094arr(battler) (gSharedMem[BSTRUCT_OFF(unk16094) + battler]) -#define eLastTakenMove_flat(i) (gSharedMem[BSTRUCT_OFF(lastTakenMove) + i]) -#define eLastTakenMove_2d(i, battler) (gSharedMem[BSTRUCT_OFF(lastTakenMove) + i + battler * 2]) #define eHpOnSwitchout(battler) (gSharedMem[BSTRUCT_OFF(HP_OnSwitchout) + battler * 2]) #define ewram160C8arr(battler) (gSharedMem[BSTRUCT_OFF(AI_monToSwitchIntoId) + (battler / 2)]) -#define ewram160CCarr(i) (gSharedMem[BSTRUCT_OFF(usedHeldItems) + i]) -#define USED_HELD_ITEM(battler) ((((u16*)(&gSharedMem[BSTRUCT_OFF(usedHeldItems) + battler * 2])))) #define USED_HELD_ITEMS(battler) (*(u16 *)&gSharedMem[BSTRUCT_OFF(usedHeldItems) + 2 * (battler)]) -#define AI_ARRAY_160CC(i) (gSharedMem[BSTRUCT_OFF(usedHeldItems) + i * 2]) #define ewram160D4(battler) (gSharedMem[BSTRUCT_OFF(unk160D4) + (battler / 2) * 2]) #define ewram160D8(battler) (gSharedMem[BSTRUCT_OFF(unk160D8) + (battler / 2)]) #define ewram160DA(battler) (gSharedMem[BSTRUCT_OFF(unk160DA) + (battler >> 1)]) #define ewram160E0(i) (gSharedMem[BSTRUCT_OFF(unk160E0) + i]) -#define CHOICED_MOVE(battler) (((u16*)(&gSharedMem[BSTRUCT_OFF(choicedMove) + battler * 2]))) -#define ewram160E8arr(i) (gSharedMem[BSTRUCT_OFF(choicedMove) + i]) -#define ewram160E8arr2(i, battler) (gSharedMem[BSTRUCT_OFF(choicedMove) + i + battler * 2]) -#define ewram160F0arr(i) (gSharedMem[BSTRUCT_OFF(changedItems) + i]) -#define ewram16100arr(i) (gSharedMem[BSTRUCT_OFF(lastTakenMoveFrom) + i]) -#define ewram16100arr2(i, battler) (gSharedMem[BSTRUCT_OFF(lastTakenMoveFrom) + i + battler * 4]) -#define ewram16108arr(i) (gSharedMem[BSTRUCT_OFF(lastTakenMoveFrom) + 8 + i]) #define ewram16400 (gSharedMem + 0x16400) // gBattleResources |