diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/contest_painting.h | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'include/contest_painting.h')
| -rw-r--r-- | include/contest_painting.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/include/contest_painting.h b/include/contest_painting.h index 5c1b065c2..ad1cecfed 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -60,26 +60,7 @@ struct LabelPair const u8 *suffix; }; -struct Unk03005E20 -{ - u8 var_0; - u8 pad1[3]; - u16 (*var_4)[][32]; - u16 (*var_8)[]; - u8 pad0C[4]; - u32 var_10; - u16 var_14; - u16 var_16; - u8 var_18; - u8 var_19; - u8 var_1A; - u8 var_1B; - u8 var_1C; - u8 var_1D; - u8 var_1E; - u8 var_1F; -}; - void sub_8106630(u32); +void CB2_ContestPainting(void); #endif |