diff options
Diffstat (limited to 'include/ewram.h')
| -rw-r--r-- | include/ewram.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/include/ewram.h b/include/ewram.h index f1d9baa78..6b164648b 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -98,13 +98,13 @@ extern u8 gSharedMem[]; #define ewram16001 (gSharedMem[0x16001]) #define ewram16002 (gSharedMem[0x16002]) #define ewram16003 (gSharedMem[0x16003]) -#define ewram16004arr(i, bank) (gSharedMem[0x16004 + i + bank * 2]) +#define ewram16004arr(i, battler) (gSharedMem[0x16004 + i + battler * 2]) #define ewram1600C (gSharedMem[0x1600C]) #define ewram1600E (gSharedMem[0x1600E]) -#define ewram16010arr(bank) (gSharedMem[0x16010 + bank]) +#define ewram16010arr(battler) (gSharedMem[0x16010 + battler]) #define ewram1601B (gSharedMem[0x1601B]) #define eDynamicMoveType (gSharedMem[0x1601C]) -#define eFocusPunchBank (gSharedMem[0x1601D]) +#define eFocusPunchBattler (gSharedMem[0x1601D]) #define eDmgMultiplier (gSharedMem[0x1601F]) #define ewram16020 ((u8 *)(gSharedMem + 0x16020)) #define ewram16020arr(i) (gSharedMem[0x16020 + i]) @@ -112,10 +112,10 @@ extern u8 gSharedMem[]; #define ewram16056 (gSharedMem[0x16056]) #define ewram16058 (gSharedMem[0x16058]) #define ewram16059 (gSharedMem[0x16059]) -#define ewram16060(bank) (gSharedMem[0x16060 + bank]) -#define BATTLE_PARTY_ID(bank) (gSharedMem[0x16064 + bank]) +#define ewram16060(battler) (gSharedMem[0x16060 + battler]) +#define BATTLE_PARTY_ID(battler) (gSharedMem[0x16064 + battler]) #define ewram16064 (&gSharedMem[0x16064]) -#define ewram16064arr(bank) (gSharedMem[0x16064 + bank]) +#define ewram16064arr(battler) (gSharedMem[0x16064 + battler]) #define ewram16068arr(i) (gSharedMem[0x16068 + i]) #define UNK_201606C_ARRAY (gSharedMem + 0x1606C) // lazy define but whatever. #define ewram1606Carr(i, a) (gSharedMem[0x1606C + i + a * 3]) @@ -132,7 +132,7 @@ extern u8 gSharedMem[]; #define ewram1608A gSharedMem[0x1608A] #define ewram1608B gSharedMem[0x1608B] -#define ewram1608Carr(bank) (gSharedMem[0x1608C + bank]) +#define ewram1608Carr(battler) (gSharedMem[0x1608C + battler]) #define EWRAM_1609D (gSharedMem[0x1609D]) #define ewram160A1 (gSharedMem[0x160A1]) #define ewram160A4 (gSharedMem[0x160A4]) @@ -144,31 +144,31 @@ extern u8 gSharedMem[]; #define ewram160AB (gSharedMem[0x160AB]) #define ewram160AC ((u8 *)(gSharedMem + 0x160AC)) #define ewram160ACarr(i) (gSharedMem[0x160AC + i]) -#define ewram160ACarr2(i, bank) (gSharedMem[0x160AC + i + bank * 2]) +#define ewram160ACarr2(i, battler) (gSharedMem[0x160AC + i + battler * 2]) #define ewram160BC ((u16 *)(gSharedMem + 0x160BC)) // hp -#define ewram160BCarr(bank) (gSharedMem[0x160BC + bank * 2]) +#define ewram160BCarr(battler) (gSharedMem[0x160BC + battler * 2]) #define ewram160C0 (gSharedMem[0x160C0]) #define ewram160C2_Flags ((u16 *)(gSharedMem + 0x160C2)) #define ewram160C4_Callback ((MainCallback *)(gSharedMem + 0x160C4)) #define ewram160C8 (gSharedMem[0x160C8]) -#define ewram160C8arr(bank) (gSharedMem[0x160C8 + (bank / 2)]) +#define ewram160C8arr(battler) (gSharedMem[0x160C8 + (battler / 2)]) #define ewram160C9 (gSharedMem[0x160C9]) #define ewram160CB (gSharedMem[0x160CB]) #define ewram160CC ((u8 *)(gSharedMem + 0x160CC)) #define ewram160CCarr(i) (gSharedMem[0x160CC + i]) -#define USED_HELD_ITEM(bank) ((((u16*)(&gSharedMem[0x160CC + bank * 2])))) -#define USED_HELD_ITEMS(bank) (*(u16 *)&gSharedMem[0x160CC + 2 * (bank)]) -#define ewram160D4(bank) (gSharedMem[0x160D4 + (bank / 2) * 2]) -#define ewram160D8(bank) (gSharedMem[0x160D8 + (bank / 2)]) -#define ewram160DA(bank) (gSharedMem[0x160DA + (bank / 2)]) +#define USED_HELD_ITEM(battler) ((((u16*)(&gSharedMem[0x160CC + battler * 2])))) +#define USED_HELD_ITEMS(battler) (*(u16 *)&gSharedMem[0x160CC + 2 * (battler)]) +#define ewram160D4(battler) (gSharedMem[0x160D4 + (battler / 2) * 2]) +#define ewram160D8(battler) (gSharedMem[0x160D8 + (battler / 2)]) +#define ewram160DA(battler) (gSharedMem[0x160DA + (battler / 2)]) #define ewram160DD (gSharedMem[0x160DD]) #define ewram160E0(i) (gSharedMem[0x160E0 + i]) #define ewram160E6 (gSharedMem[0x160E6]) #define ewram160E7 (gSharedMem[0x160E7]) -#define CHOICED_MOVE(bank) (((u16*)(&gSharedMem[0x160E8 + bank * 2]))) +#define CHOICED_MOVE(battler) (((u16*)(&gSharedMem[0x160E8 + battler * 2]))) #define ewram160E8 ((u8 *)(gSharedMem + 0x160E8)) #define ewram160E8arr(i) (gSharedMem[0x160E8 + i]) -#define ewram160E8arr2(i, bank) (gSharedMem[0x160E8 + i + bank * 2]) +#define ewram160E8arr2(i, battler) (gSharedMem[0x160E8 + i + battler * 2]) #define ewram160F0 ((u8 *)(gSharedMem + 0x160F0)) #define ewram160F0arr(i) (gSharedMem[0x160F0 + i]) #define ewram160F8 (gSharedMem[0x160F8]) @@ -177,7 +177,7 @@ extern u8 gSharedMem[]; #define ewram160FB (gSharedMem[0x160FB]) #define ewram16100 ((u8 *)(gSharedMem + 0x16100)) #define ewram16100arr(i) (gSharedMem[0x16100 + i]) -#define ewram16100arr2(i, bank) (gSharedMem[0x16100 + i + bank * 4]) +#define ewram16100arr2(i, battler) (gSharedMem[0x16100 + i + battler * 4]) #define ewram16108 ((u8 *)(gSharedMem + 0x16108)) #define ewram16108arr(i) (gSharedMem[0x16108 + i]) #define ewram16110 (gSharedMem[0x16110]) @@ -186,7 +186,7 @@ extern u8 gSharedMem[]; #define ewram16113 (gSharedMem[0x16113]) #define ewram16400 (gSharedMem + 0x16400) #define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800)) -#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (gSharedMem + 0x16A00)) +#define AI_BATTLE_HISTORY ((struct BattleHistory *) (gSharedMem + 0x16A00)) #define AI_STACK ((struct AI_Stack *) (gSharedMem + 0x16C00)) #define AI_ARRAY_160CC(i) (gSharedMem[0x160CC + i * 2]) #define ewram16800 (&gSharedMem[0x16800]) |