diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /data/graphics/field_objects/base_oam.inc | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'data/graphics/field_objects/base_oam.inc')
| -rw-r--r-- | data/graphics/field_objects/base_oam.inc | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/data/graphics/field_objects/base_oam.inc b/data/graphics/field_objects/base_oam.inc deleted file mode 100644 index 7a2793374..000000000 --- a/data/graphics/field_objects/base_oam.inc +++ /dev/null @@ -1,47 +0,0 @@ - .align 2 - -gFieldOamData_8x8:: @ 83711C4 - .4byte OAM_SIZE_8x8 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_16x8:: @ 83711CC - .4byte OAM_SIZE_16x8 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_16x16:: @ 83711D4 - .4byte OAM_SIZE_16x16 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_32x8:: @ 83711DC - .4byte OAM_SIZE_32x8 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_64x32:: @ 83711E4 - .4byte OAM_SIZE_64x32 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_16x32:: @ 83711EC - .4byte OAM_SIZE_16x32 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_32x32:: @ 83711F4 - .4byte OAM_SIZE_32x32 - .2byte 2 << 10 @ priority - - .align 2 - -gFieldOamData_64x64:: @ 83711FC - .4byte OAM_SIZE_64x64 - .2byte 2 << 10 @ priority |