Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize

This commit is contained in:
GriffinR
2023-01-18 11:07:12 -05:00
1149 changed files with 44393 additions and 46317 deletions
+8 -5
View File
@@ -67,11 +67,8 @@
#define DISPLAY_WIDTH 240
#define DISPLAY_HEIGHT 160
#define PLTT_SIZEOF(n) ((n) * sizeof(u16))
#define PLTT_SIZE_4BPP PLTT_SIZEOF(16)
#define PLTT_SIZE_8BPP PLTT_SIZEOF(256)
#define PLTT_OFFSET_4BPP(n) ((n) * PLTT_SIZE_4BPP)
#define DISPLAY_TILE_WIDTH (DISPLAY_WIDTH / 8)
#define DISPLAY_TILE_HEIGHT (DISPLAY_HEIGHT / 8)
#define TILE_SIZE_4BPP 32
#define TILE_SIZE_8BPP 64
@@ -81,4 +78,10 @@
#define TOTAL_OBJ_TILE_COUNT 1024
#define PLTT_SIZEOF(n) ((n) * sizeof(u16))
#define PLTT_SIZE_4BPP PLTT_SIZEOF(16)
#define PLTT_SIZE_8BPP PLTT_SIZEOF(256)
#define PLTT_OFFSET_4BPP(n) ((n) * PLTT_SIZE_4BPP)
#endif // GUARD_GBA_DEFINES_H