Merge

src/engine/engine.c

@@ -11,17 +11,13 @@
 #include "console/console.h"
 #include "display/display.h"
 #include "asset/asset.h"
+#include "rpg/rpg.h"
 
+#include "display/palette.h"
 #include "scene/test/scenetest.h"
 
 engine_t ENGINE;
 
-void assetLoadCallback(void *data) {
-  consolePrint("Asset load callback called!");
-  // test = ASSET.loaded.palette;
-  // consolePrint("Loaded palette with %d colors", ASSET.data.palette.colorCount);
-}
-
 errorret_t engineInit(void) {
   memoryZero(&ENGINE, sizeof(engine_t));
   ENGINE.running = true;
@@ -31,8 +27,10 @@ errorret_t engineInit(void) {
   consoleInit();
   errorChain(assetInit());
   errorChain(displayInit());
+  rpgInit();
 
-  assetLoad("entities.dpi", assetLoadCallback, NULL);
+  uint8_t slot = 0;
+  assetLoad("entities.dpi", paletteAssetLoadCallback, &slot);
   if(ASSET.state == ASSET_STATE_ERROR) errorChain(ASSET.error);
 
   sceneTestAdd();