diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-02 18:19:49 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-02 18:19:49 +0100 |
| commit | 5243285ab2cbf895f28e9866e3f5671326422348 (patch) | |
| tree | 1f5c7d07dc5c9e6c0660906b0174f7f682767992 /include | |
| parent | 63210c07897e86953bf093397eee5a33e95b8c91 (diff) | |
start working on battle 7
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 6 | ||||
| -rw-r--r-- | include/battle_script_commands.h | 2 | ||||
| -rw-r--r-- | include/malloc.h | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 1916f450a..d958294b1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -944,6 +944,12 @@ struct BattleAnimationInfo u8 field_9_x20 : 1; u8 field_9_x40 : 1; u8 field_9_x80 : 1; + u8 field_A; + u8 field_B; + u8 field_C; + u8 field_D; + u8 field_E; + u8 field_F; }; struct BattleHealthboxInfo diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index a466abc04..ebfeabccc 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -57,6 +57,6 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); bool8 UproarWakeUpCheck(u8 bank); extern void (* const gBattleScriptingCommandsTable[])(void); -extern const u8 gUnknown_0831C494[]; +extern const u8 gUnknown_0831C494[][4]; #endif // GUARD_BATTLE_SCRIPT_COMMANDS_H diff --git a/include/malloc.h b/include/malloc.h index f3a731797..003ee1f03 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -5,6 +5,12 @@ #define calloc(ct, sz) AllocZeroed((ct) * (sz)) #define free Free +#define FREE_AND_SET_NULL(ptr) \ +{ \ + free(ptr); \ + ptr = NULL; \ +} + extern u8 gHeap[]; void *Alloc(u32 size); void *AllocZeroed(u32 size); |