housekeeping

src/app/gfx/bitmap.cc

@@ -1,8 +1,10 @@
 #include "bitmap.h"
 
+#include <SDL2/SDL.h>
 #include <rommapping.h>
 
-#include "rom.h"
+#include "app/core/constants.h"
+#include "app/rom.h"
 
 namespace yaze {
 namespace app {
@@ -28,7 +30,7 @@ int GetPCGfxAddress(char *romData, char id) {
   char gfxGamePointer3 = romData[gfxPointer3 + id];
 
   return lorom_snes_to_pc(
-      AddressFromBytes(gfxGamePointer1, gfxGamePointer2, gfxGamePointer3),
+      yaze::app::rom::AddressFromBytes(gfxGamePointer1, gfxGamePointer2, gfxGamePointer3),
       info1);
 }
 

src/app/gfx/bitmap.h

@@ -2,8 +2,10 @@
 #define YAZE_APP_UTILS_BITMAP_H
 
 #include <SDL2/SDL.h>
+#include <rommapping.h>
 
-#include "Core/constants.h"
+#include "app/core/constants.h"
+#include "app/rom.h"
 
 namespace yaze {
 namespace app {

src/app/gfx/snes_palette.cc

@@ -1,7 +1,17 @@
-#include "palette.h"
+#include "snes_palette.h"
 
+#include <SDL2/SDL.h>
+#include <imgui/imgui.h>
+#include <palette.h>
+#include <tile.h>
+
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
+#include <memory>
+#include <vector>
+
 
 namespace yaze {
 namespace app {
@@ -57,7 +67,7 @@ SNESPalette::SNESPalette(const unsigned char* snes_pal) {
   size_ = sizeof(snes_pal) / 2;
   for (unsigned i = 0; i < sizeof(snes_pal); i += 2) {
     SNESColor col;
-    col.snes = snes_pal[i + 1] << (uint16_t) 8;
+    col.snes = snes_pal[i + 1] << (uint16_t)8;
     col.snes = col.snes | snes_pal[i];
     m_color mColor = convertcolor_snes_to_rgb(col.snes);
     col.rgb = ImVec4(mColor.red, mColor.green, mColor.blue, 1.f);

src/app/gfx/snes_palette.h

@@ -7,6 +7,8 @@
 #include <tile.h>
 
 #include <cstdint>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <memory>
 #include <vector>

src/app/gfx/tile.cc

@@ -13,8 +13,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/core/constants.h"
-#include "app/gfx/palette.h"
+#include "app/gfx/snes_palette.h"
+
 
 namespace yaze {
 namespace app {

src/app/gfx/tile.h

@@ -14,13 +14,17 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/core/constants.h"
-#include "app/gfx/palette.h"
+#include "app/gfx/snes_palette.h"
 
 namespace yaze {
 namespace app {
 namespace gfx {
 
+using ushort = unsigned short;
+using uchar = unsigned char;
+using ulong = unsigned long;
+using uint = unsigned int;
+
 // vhopppcc cccccccc
 // [0, 1]
 // [2, 3]