hate

src/conversation/items/gameintro.c

@@ -10,6 +10,7 @@
 
 void conversationQueueGameBegin() {
   char buffer[TEXTBOX_BUFFER_MAX];
-  sprintf(STR_GAME_BEGIN, POKER_GAME_BLINDS_CURRENT * 2, POKER_GAME_BLINDS_CURRENT);
+  sprintf(buffer, STR_GAME_BEGIN, POKER_GAME_BLINDS_CURRENT * 2, POKER_GAME_BLINDS_CURRENT);
   conversationTextboxSetText(buffer);
+  QUEUE_ITEM = QUEUE_DEAL_CARDS;
 }

src/conversation/queue.c

@@ -23,7 +23,7 @@ void conversationQueueDebug() {
 
 void conversationQueueDealCards() {
   QUEUE_ITEM = QUEUE_BEGIN_BETTING;
-  conversationTextboxSetText(STR_POKER_GAME_CARDS_DEALT);
+  conversationQueueNext();
 }
 
 void conversationQueueStart() {

src/drawing/playerchips.c

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2022 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "playerchips.h"
+
+// POKER_HUMAN_INDEX
+inline void playerChipsDraw() {
+  char stringBuffer[24];
+  char tileBuffer[24];// TODO convert magics into a definition
+  uint8_t i;
+
+  sprintf(stringBuffer, STR_CHIPS_DISPLAY, POKER_PLAYERS[POKER_HUMAN_INDEX].chips);
+  i = spriteFontBufferStringToTiles(stringBuffer, tileBuffer);
+  spriteBufferBackground(0x00, 0x0C, i, 0x01, tileBuffer);
+}

src/drawing/playerchips.h

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2022 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "../libs.h"
+#include "../sprites/spritefont.h"
+#include "../poker/poker.h"
+#include "../strings.h"
+#include "../sprites/sprites.h"
+
+inline void playerChipsDraw();

src/drawing/playerdeal.c

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2022 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "playerdeal.h"
+
+const uint8_t DEAL_CARD_X = 0x00;
+const uint8_t DEAL_CARD_Y = 0x00;
+
+void playerDealCardRender() {
+  
+}

src/drawing/playerdeal.h

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2022 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "../libs.h"
+#include "../poker/poker.h"
+
+#define PLAYER_DEAL_SPRITE_0 0x00
+#define PLAYER_DEAL_SPRITE_1 PLAYER_DEAL_SPRITE_0 + 0x01
+
+extern const uint8_t DEAL_CARD_X;
+extern const uint8_t DEAL_CARD_Y;

src/interrupts.c

@@ -10,6 +10,7 @@
 void interruptOnScanline() {
   if(LYC_REG == 0) {
     LCDC_REG |= LCDCF_BG8000;
+
     if((TEXTBOX_STATE & TEXTBOX_STATE_VISIBLE) != 0) {
       LYC_REG = INTERRUPT_TEXTBOX_VRAM;
     }

src/main.c

@@ -6,7 +6,9 @@
  */
 
 #include "main.h"
-
+#include "drawing/playerchips.h"
+#include "sprites/sprites.h"
+#include "sprites/spritecardsmall.h"
 
 void main() {
   int16_t j;
@@ -18,14 +20,7 @@ void main() {
   // Create a critical section for some video stuff
   CRITICAL {
     DISPLAY_OFF;
-    LCDC_REG = LCDCF_OFF | LCDCF_WIN9C00 | LCDCF_BG8000 | LCDCF_BG9800 | LCDCF_BGON;
-      /*
-    * LCD        = Off
-    * WindowBank = 0x9C00
-    * BG Chr     = 0x8800
-    * BG Bank    = 0x9800
-    * BG         = On
-    */
+    LCDC_REG = LCDCF_OFF | LCDCF_WIN9C00 | LCDCF_BG8000 | LCDCF_BG9800 | LCDCF_BGON | LCDCF_OBJ16 | LCDCF_OBJON;
 
     STAT_REG |= STATF_LYC;
     LYC_REG = 0x00;
@@ -48,6 +43,7 @@ void main() {
   spriteCardsBuffer();
   spriteFontBuffer();
   spriteBorderBuffer();
+  spriteCardSmallBuffer();
 
   conversationTextboxInit();
   conversationQueueInit();
@@ -59,11 +55,6 @@ void main() {
   }
   spriteBufferBackground(0x00, 0x00, GB_BACKGROUND_COLUMNS, GB_BACKGROUND_ROWS, filled);
 
-  // Card Test
-  uint8_t cardTiles[SPRITE_CARD_TILE_COUNT];
-  spriteCardBufferTiles(cardTiles, CARD_SPADES_QUEEN);
-  spriteBufferBackground(0x00, 0x00, SPRITE_CARD_WIDTH, SPRITE_CARD_HEIGHT, cardTiles);
-
   // Now turn the screen on
   DISPLAY_ON;
   enable_interrupts();
@@ -72,11 +63,21 @@ void main() {
   // Begin game
   conversationQueueNext();
 
+  spriteBufferSprite(0x00, SPRITE_CARD_SMALL);
+  spriteBufferSprite(0x01, SPRITE_CARD_SMALL);
+  set_sprite_prop(0x01, S_FLIPX);
+
   // Begin the loop
   while(1) {
     // Perform non-graphical code updates
     wait_vbl_done();
 
+    uint8_t posX, posY;
+    posX = 16;
+    posY = 16;
+    move_sprite(0x00, posX, posY);
+    move_sprite(0x01, posX + 0x08, posY);
+
     // Update the input state
     INPUT_LAST = INPUT_STATE;
     INPUT_STATE = joypad();
@@ -94,7 +95,6 @@ void main() {
 
     // Update conversation fade effect
     conversationFadeUpdate();
-    // mainDebugDraw();
-    LCDC_REG |= LCDCF_BG8000;
+    playerChipsDraw();
   }
 }

src/sprites/cards/spritecardscommon.h

@@ -13,6 +13,7 @@
 #include "../sprites.h"
 
 #define SPRITE_CARD_VRAM_START SPRITE_TILESET_VRAM_END_LOW
+#define SPRITE_CARD_VRAM_END SPRITE_CARD_VRAM_START + CARDS_TILES_IMAGE_TILES
 #define SPRITE_CARD_BLANK SPRITE_TILESET_WHITE_LOW
 
 // Information about the card as a tilemap

src/sprites/spritecardsmall.c

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2022 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "spritecardsmall.h"
+
+inline void spriteCardSmallBuffer() {
+  spriteBufferLow(SPRITE_CARD_SMALL_VRAM_START, CARD_BACK_SMALL_IMAGE_TILES, CARD_BACK_SMALL_IMAGE);
+}
+

src/sprites/spritecardsmall.h

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2022 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "../libs.h"
+#include "sprites.h"
+#include "CARD_BACK_SMALL.h"
+#include "spritecards.h"
+
+#define SPRITE_CARD_SMALL_VRAM_START SPRITE_CARD_VRAM_END
+#define SPRITE_CARD_SMALL_VRAM_END SPRITE_CARD_SMALL_VRAM_START + CARD_BACK_SMALL_IMAGE_TILES
+
+#define SPRITE_CARD_SMALL SPRITE_CARD_SMALL_VRAM_START
+
+inline void spriteCardSmallBuffer();

src/sprites/spritefont.c

@@ -14,3 +14,15 @@ inline void spriteFontBuffer() {
 inline uint8_t spriteFontTileFromChar(char character) {
   return character - SPRITE_FONT_FIRST_CHARACTER + SPRITE_FONT_VRAM_START;
 }
+
+inline uint8_t spriteFontBufferStringToTiles(char *string, char *tiles) {
+  char c;
+  uint8_t i;
+
+  i = 0;
+  while((c = string[i]) != '\0') {
+    tiles[i++] = spriteFontTileFromChar(c);
+  }
+
+  return i;
+}

src/sprites/spritefont.h

@@ -29,3 +29,13 @@ inline void spriteFontBuffer();
  * @return The tile index for the given character.
  */
 inline uint8_t spriteFontTileFromChar(char character);
+
+/**
+ * Buffers a character array into a tile array, does not care about length nor
+ * newlines, you will need to handle this yourself.
+ * 
+ * @param string String to buffer.
+ * @param tiles Tile array to buffer in to.
+ * @return The length of the string.
+ */
+inline uint8_t spriteFontBufferStringToTiles(char *string, char *tiles);

src/sprites/sprites.c

@@ -44,3 +44,7 @@ inline void spriteBufferWindow(
     tiles
   );
 }
+
+inline void spriteBufferSprite(uint8_t spriteIndex, uint8_t tile) {
+  set_sprite_tile(spriteIndex, tile);
+}

src/sprites/sprites.h

@@ -44,3 +44,5 @@ inline void spriteBufferWindow(
   uint8_t width, uint8_t height,
   uint8_t *tiles
 );
+
+inline void spriteBufferSprite(uint8_t spriteIndex, uint8_t tile);

src/strings.c

@@ -7,16 +7,11 @@
 
 #include "strings.h"
 
-const char STR_GAME_BEGIN[] = "The blinds are set %u for the big, and %u for the small blinds.";
-
-
-
-
-
-
-
-
 const char STR_ERROR[] = "An error\nhas occured";
+const char STR_GAME_BEGIN[] = "The blinds are set %u for the big, and %u for the small blinds.";
+const char STR_CHIPS_DISPLAY[] = "Chips $%u";
+
+
 const char STR_HELLO[] = "Hello World, How are you today?\nGood thanks. Thank god!";
 
 const char STR_POKER_GAME_START[] = "Poker game started";

src/strings.h

@@ -8,14 +8,11 @@
 #pragma once
 #include "libs.h"
 
-extern const char STR_GAME_BEGIN[];
-
-
-
-
-
-
 extern const char STR_ERROR[];
+extern const char STR_GAME_BEGIN[];
+extern const char STR_CHIPS_DISPLAY[];
+
+
 extern const char STR_HELLO[];
 
 extern const char STR_POKER_GAME_START[];