diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 49 | ||||
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | include/global.h | 20 | ||||
| -rw-r--r-- | include/menu.h | 1 | ||||
| -rw-r--r-- | include/record_mixing.h | 4 |
5 files changed, 19 insertions, 56 deletions
diff --git a/include/battle.h b/include/battle.h index ac12533e3..510db80f6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -319,54 +319,7 @@ struct BattleStruct /* 0x2000000 */ /*0x1601E*/ u8 statChanger; /*0x1601F*/ u8 dmgMultiplier; /*0x16020*/ u8 wrappedBy[4]; - /*0x16024*/ u8 unk16024; - /*0x16025*/ u8 unk16025; - /*0x16026*/ u8 unk16026; - /*0x16027*/ u8 unk16027; - /*0x16028*/ u8 unk16028; - /*0x16029*/ u8 unk16029; - /*0x1602A*/ u8 unk1602A; - /*0x1602B*/ u8 unk1602B; - /*0x1602C*/ u8 unk1602C; - /*0x1602D*/ u8 unk1602D; - /*0x1602E*/ u8 unk1602E; - /*0x1602F*/ u8 unk1602F; - /*0x16030*/ u8 unk16030; - /*0x16031*/ u8 unk16031; - /*0x16032*/ u8 unk16032; - /*0x16033*/ u8 unk16033; - /*0x16034*/ u8 unk16034; - /*0x16035*/ u8 unk16035; - /*0x16036*/ u8 unk16036; - /*0x16037*/ u8 unk16037; - /*0x16038*/ u8 unk16038; - /*0x16039*/ u8 unk16039; - /*0x1603A*/ u8 unk1603A; - /*0x1603B*/ u8 unk1603B; - /*0x1603C*/ u8 unk1603C; - /*0x1603D*/ u8 unk1603D; - /*0x1603E*/ u8 unk1603E; - /*0x1603F*/ u8 unk1603F; - /*0x16040*/ u8 unk16040; - /*0x16041*/ u8 unk16041; - /*0x16042*/ u8 unk16042; - /*0x16043*/ u8 unk16043; - /*0x16044*/ u8 unk16044; - /*0x16045*/ u8 unk16045; - /*0x16046*/ u8 unk16046; - /*0x16047*/ u8 unk16047; - /*0x16048*/ u8 unk16048; - /*0x16049*/ u8 unk16049; - /*0x1604A*/ u8 unk1604A; - /*0x1604B*/ u8 unk1604B; - /*0x1604C*/ u8 unk1604C; - /*0x1604D*/ u8 unk1604D; - /*0x1604E*/ u8 unk1604E; - /*0x1604F*/ u8 unk1604F; - /*0x16050*/ u8 unk16050; - /*0x16051*/ u8 unk16051; - /*0x16052*/ u8 unk16052; - /*0x16053*/ u8 unk16053; + /*0x16024*/ u16 assistMove[24]; /*0x16054*/ u8 unk16054; /*0x16055*/ u8 unk16055; /*0x16056*/ u8 moneyMultiplier; diff --git a/include/ewram.h b/include/ewram.h index 4042ea03b..da544f5c2 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -133,6 +133,7 @@ extern u8 gSharedMem[]; #define ewram1608Carr(battler) (gSharedMem[0x1608C + battler]) #define ewram16094arr(battler) (gSharedMem[0x16094 + battler]) #define EWRAM_1609D (gSharedMem[0x1609D]) +#define ewram1609e(flank) (gSharedMem[0x1609E + (flank)]) #define ewram160A1 (gSharedMem[0x160A1]) #define ewram160A4 (gSharedMem[0x160A4]) #define ewram160A5 (gSharedMem[0x160A5]) diff --git a/include/global.h b/include/global.h index d64cf987d..7fd7e902a 100644 --- a/include/global.h +++ b/include/global.h @@ -10,12 +10,13 @@ #if defined(__APPLE__) || defined(__CYGWIN__) #define _(x) x #define __(x) x -#define INCBIN_U8 {0} -#define INCBIN_U16 {0} -#define INCBIN_U32 {0} -#define INCBIN_S8 {0} -#define INCBIN_S16 {0} -#define INCBIN_S32 {0} +#define INCBIN(x) {0} +#define INCBIN_U8 INCBIN +#define INCBIN_U16 INCBIN +#define INCBIN_U32 INCBIN +#define INCBIN_S8 INCBIN +#define INCBIN_S16 INCBIN +#define INCBIN_S32 INCBIN #endif // Prevent cross-jump optimization. @@ -64,6 +65,13 @@ enum #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +#define T2_WRITE_32(ptr, value) ({\ + (ptr)[0] = ((value) >> 0) & 0xFF;\ + (ptr)[1] = ((value) >> 8) & 0xFF;\ + (ptr)[2] = ((value) >> 16) & 0xFF;\ + (ptr)[3] = ((value) >> 24) & 0xFF;\ +}) + // Credits to Made (dolphin emoji) #define S16TOPOSFLOAT(val) \ ({ \ diff --git a/include/menu.h b/include/menu.h index 921a05eca..a6ff6050e 100644 --- a/include/menu.h +++ b/include/menu.h @@ -84,6 +84,7 @@ void unref_sub_8072DC0(void); void sub_8072DCC(u8); void sub_8072DDC(u8); void Menu_DestroyCursor(void); +u8 MoveMenuCursor3(s8 delta); #if GERMAN u8 *de_sub_8073174(u8 *name, const u8 *format); diff --git a/include/record_mixing.h b/include/record_mixing.h index 96105f3f7..2e6b048a6 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -22,12 +22,12 @@ void sub_80B9A78(void); void sub_80B9A88(u8 *a); void sub_80B9B1C(u8 *a, size_t size, u8 index); void sub_80B9B70(void *a, u32 size, u8 index); -u8 sub_80B9BBC(u16 *a); +u8 sub_80B9BBC(struct DayCareMail *a); void sub_80B9BC4(u8 *, size_t, u8[][2], u8 d, u8 e); u8 sub_80B9C4C(u8 *a); // ASM -void sub_80B9C6C(u8 *, u32, u8, void *); +void sub_80B9C6C(struct RecordMixingDayCareMail *, size_t, u8, TVShow *); void sub_80B9F3C(u16 *, u8); void sub_80BA00C(u8); |