diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 21:13:37 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 21:13:37 -0400 |
| commit | 7929bdf80b174f31c512970b2fa64652f222a09b (patch) | |
| tree | 550d51797bab0425646ee8b47552cbad57c7ac0c /include/ewram.h | |
| parent | a3a160964ddaae34383e884434132e35d6dbb158 (diff) | |
Merge several EWRAM definitions into gBattleStruct
Diffstat (limited to 'include/ewram.h')
| -rw-r--r-- | include/ewram.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/ewram.h b/include/ewram.h index 85085e075..947fa274e 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -89,31 +89,20 @@ extern u8 gSharedMem[]; // Battle Struct // For matching purposes, the struct is placed at 0x02000000 and // there's a ton of filler. -#define ewram16003 (gSharedMem[0x16003]) #define ewram16004arr(i, battler) (gSharedMem[0x16004 + i + battler * 2]) #define ewram16010arr(battler) (gSharedMem[0x16010 + battler]) -#define eDynamicMoveType (gSharedMem[0x1601C]) -#define eFocusPunchBattler (gSharedMem[0x1601D]) -#define eDmgMultiplier (gSharedMem[0x1601F]) -#define ewram16020 ((u8 *)(gSharedMem + 0x16020)) #define ewram16020arr(i) (gSharedMem[0x16020 + i]) #define ewram16058 (gSharedMem[0x16058]) #define ewram16060(battler) (gSharedMem[0x16060 + battler]) #define BATTLE_PARTY_ID(battler) (gSharedMem[0x16064 + battler]) #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]) #define ewram16088 (gSharedMem[0x16088]) #define ewram16089 (gSharedMem[0x16089]) #define ewram1608Carr(battler) (gSharedMem[0x1608C + battler]) #define ewram16094arr(battler) (gSharedMem[0x16094 + battler]) -#define EWRAM_1609D (gSharedMem[0x1609D]) -#define ewram160A8 (gSharedMem[0x160A8]) -#define ewram160A9 (gSharedMem[0x160A9]) -#define ewram160AA (gSharedMem[0x160AA]) -#define ewram160AB (gSharedMem[0x160AB]) #define eLastTakenMove_flat(i) (gSharedMem[0x160AC + i]) #define eLastTakenMove_2d(i, battler) (gSharedMem[0x160AC + i + battler * 2]) #define eHpOnSwitchout(battler) (gSharedMem[0x160BC + battler * 2]) @@ -124,15 +113,11 @@ extern u8 gSharedMem[]; #define ewram160D4(battler) (gSharedMem[0x160D4 + (battler / 2) * 2]) #define ewram160D8(battler) (gSharedMem[0x160D8 + (battler / 2)]) #define ewram160DA(battler) (gSharedMem[0x160DA + (battler >> 1)]) -#define ewram160DD (gSharedMem[0x160DD]) #define ewram160E0(i) (gSharedMem[0x160E0 + i]) #define CHOICED_MOVE(battler) (((u16*)(&gSharedMem[0x160E8 + battler * 2]))) #define ewram160E8arr(i) (gSharedMem[0x160E8 + i]) #define ewram160E8arr2(i, battler) (gSharedMem[0x160E8 + i + battler * 2]) -#define ewram160F0 ((u8 *)(gSharedMem + 0x160F0)) #define ewram160F0arr(i) (gSharedMem[0x160F0 + i]) -#define ewram160FB (gSharedMem[0x160FB]) -#define ewram16100 ((u8 *)(gSharedMem + 0x16100)) #define ewram16100arr(i) (gSharedMem[0x16100 + i]) #define ewram16100arr2(i, battler) (gSharedMem[0x16100 + i + battler * 4]) #define ewram16108arr(i) (gSharedMem[0x16108 + i]) |