diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/data/field_map_obj/base_oam.h | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
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 8595f97e7..000000000 --- a/include/data/field_map_obj/base_oam.h +++ /dev/null @@ -1,56 +0,0 @@ -// -// Created by scott on 6/17/2017. -// - -#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 |