diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-27 23:41:35 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-27 23:41:35 -0400 |
commit | 1da42d0c0ba0499203e60523f9cfd4cb3abc75eb (patch) | |
tree | 2e7be4a2d4351e4136fa3d76b27117ebae08bd83 /include/data/field_map_obj/base_oam.h | |
parent | 1c2a815d7b31bc9f43c26e4ea0bf346487b958ac (diff) | |
parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) |
Merge branch 'master' into secret_base_data_fix
Diffstat (limited to 'include/data/field_map_obj/base_oam.h')
-rw-r--r-- | include/data/field_map_obj/base_oam.h | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/include/data/field_map_obj/base_oam.h b/include/data/field_map_obj/base_oam.h deleted file mode 100644 index 49c14e8c2..000000000 --- a/include/data/field_map_obj/base_oam.h +++ /dev/null @@ -1,56 +0,0 @@ -// - -// - -#ifndef POKERUBY_BASE_OAM_H -#define POKERUBY_BASE_OAM_H - -const struct OamData gFieldOamData_8x8 = { - .shape = 0, - .size = 0, - .priority = 2 -}; - -const struct OamData gFieldOamData_16x8 = { - .shape = 1, - .size = 0, - .priority = 2 -}; - -const struct OamData gFieldOamData_16x16 = { - .shape = 0, - .size = 1, - .priority = 2 -}; - -const struct OamData gFieldOamData_32x8 = { - .shape = 1, - .size = 1, - .priority = 2 -}; - -const struct OamData gFieldOamData_64x32 = { - .shape = 1, - .size = 3, - .priority = 2 -}; - -const struct OamData gFieldOamData_16x32 = { - .shape = 2, - .size = 2, - .priority = 2 -}; - -const struct OamData gFieldOamData_32x32 = { - .shape = 0, - .size = 2, - .priority = 2 -}; - -const struct OamData gFieldOamData_64x64 = { - .shape = 0, - .size = 3, - .priority = 2 -}; - -#endif //POKERUBY_BASE_OAM_H |