diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-05 12:55:45 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-05 12:55:45 -0500 |
| commit | 5fc9a151463ade7d260ce5f105674908d6e4449d (patch) | |
| tree | 2a8170af85bb22aa45eb23e5bf3da949d66b38b8 /include/battle.h | |
| parent | 4cf701c5871a17f0bc580019e8d294bc1c84ebf3 (diff) | |
move ewram.h includes in include/ to src files.
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 692e1a981..c2e1063d3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -234,7 +234,11 @@ struct AI_ThinkingStruct /* 0x2016800 */ struct BattleStruct /* 0x2000000 */ { - u8 filler0[0x15DDE]; + /*0x00000*/ u8 unk0; + /*0x00001*/ bool8 unk1; + /*0x00002*/ u8 unk2; + /*0x00003*/ bool8 unk3; + u8 filler4[0x15DDA]; /*0x15DDE*/ u8 unk15DDE; /*0x15DDF*/ u8 unk15DDF; /*0x15DE0*/ u8 filler15DE0[0x220]; @@ -530,6 +534,11 @@ struct BattleResults u8 unk36[10]; // usedBalls? }; +struct Struct2017100 +{ + u32 arr[4]; +}; + struct Struct2017800 { u8 invisible:1; @@ -668,8 +677,6 @@ extern struct WishFutureKnock gWishFutureKnock; extern struct AI_ThinkingStruct gAIThinkingSpace; extern struct Struct20238C8 gUnknown_020238C8; -#include "ewram.h" - // used in many battle files, it seems as though Hisashi Sogabe wrote // some sort of macro to replace the use of actually calling memset. // Perhaps it was thought calling memset was much slower? |