diff options
Diffstat (limited to 'include/ewram.h')
| -rw-r--r-- | include/ewram.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/ewram.h b/include/ewram.h index 01c4c3492..390ad9d80 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -25,8 +25,6 @@ extern u8 gSharedMem[]; #define eVoidSharedArr2 (u32)(ewram_addr) // ew(ram) #define eSlotMachine ((struct SlotMachineEwramStruct *)(gSharedMem + 0x0)) #define ewram0_9(i) (u8 *)(ewram_addr + (i * 0x20)) -#define ewram0_10 (*(struct UnknownPokenav0*)(gSharedMem + 0)) -#define ewram0_11 (*(struct UnknownPokenav0_1*)(gSharedMem + 0)) #define ePokemonStorageSystem (*(struct PokemonStorageSystemData *)(gSharedMem + 0)) #define ewram4 (*(struct UnknownStruct8 *)(gSharedMem + 0x4)) #define ewram520 ((struct UnknownStruct7 *)(gSharedMem + 0x00520)) @@ -133,6 +131,7 @@ extern u8 gSharedMem[]; #define ewram1608B gSharedMem[0x1608B] #define ewram1608Carr(battler) (gSharedMem[0x1608C + battler]) +#define ewram16094arr(battler) (gSharedMem[0x16094 + battler]) #define EWRAM_1609D (gSharedMem[0x1609D]) #define ewram160A1 (gSharedMem[0x160A1]) #define ewram160A4 (gSharedMem[0x160A4]) @@ -160,7 +159,7 @@ extern u8 gSharedMem[]; #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 ewram160DA(battler) (gSharedMem[0x160DA + (battler >> 1)]) #define ewram160DD (gSharedMem[0x160DD]) #define ewram160E0(i) (gSharedMem[0x160E0 + i]) #define ewram160E6 (gSharedMem[0x160E6]) |