diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
| commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
| tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/party_menu.h | |
| parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
| parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/party_menu.h')
| -rw-r--r-- | include/party_menu.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/party_menu.h b/include/party_menu.h index 58292081f..9ce476869 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -43,10 +43,14 @@ struct Struct201B000 u8 unk259; u8 filler25A[6]; u8 unk260; - u8 filler261[1]; + u8 unk261; u8 unk262; s16 unk264; s16 unk266; + u8 filler268[10]; + u16 unk272; + u8 filler274[14]; + u16 unk282; }; extern u8 ewram[]; |