From 3a30bc5e53f8fe462228e25abea97661c67ec2b6 Mon Sep 17 00:00:00 2001
From: Wyatt <wyattf@gmail.com>
Date: Thu, 28 Jul 2022 01:52:44 -0400
Subject: [PATCH] small improvements, removed old files

---
 2048.gb      | Bin 32768 -> 32768 bytes
 make.bat     |  11 +----------
 src/board.h  |   1 +
 src/config.h |   9 +++------
 src/font.h   |   4 ++--
 src/main.c   |  26 ++++++++++----------------
 src/sounds.c |  13 -------------
 src/sounds.h |   8 --------
 8 files changed, 17 insertions(+), 55 deletions(-)
 delete mode 100644 src/sounds.c
 delete mode 100644 src/sounds.h

diff --git a/2048.gb b/2048.gb
index 3ea81219125a880b63d06fc2f79b0e953df15d93..73f6068bb2518e43dd66d1f3bae25ed791d44ad5 100644
GIT binary patch
delta 1456
zcmZ8hUu;uV7(eIU+uL>Y-)(!_3&X9K&aMpDrguYWN?F9QIACRrtQ*PJy~yGNe+)6K
zHnvqXOB9ghhz|rpVtl~FI2B``jP2%~UXt^$WVafE$wY6c4}c4+xtT;fx9xQJ^5y$}
z=lA>0cYf#Go6S<$EOjvt&rTQ4Q&+B`L(mWJqE}%fRM15znyw0e;jhrw@IYe=uY=P%
z6OOTf9`k}EN=#nXK|c%Ps*DrJPi+bw=6_MdmHbYCf3kA7Syco94S(+~F`U(+ik^CH
z#!<$>8{^cB1+E~cwRa04QwDjFtb?W+`MV9O$g-MfrZpTyN$Yd)DEh+6#|atY)Ap!&
zX@B&srM|ffcKo9U-}SIyvgqz;;Q%0;Kuwlr$`TF=CH6_A$6I0<VeyadKeJ2S3U`H4
z#Xyj3iJr2(1e?)>t;G@5!5P8vM$zwQb+9vluG*U0j7EZ22bu_>rd!fwNoPsGMmrsL
z(ge!g++!n_$SOXH9@sXDJYQmT=jahRT341-eQRrCNX4J=B~#&*aaq;yduXfunO#O>
zWo<;=e5?&<m8J^!h#_upH8(aBAGr<HLJ=PlchLp=3!caJf>n5k2OKlvgZ!2=<j9<k
zezRw6XWbIHsMY&<GUGXP%F(=i*;Pp8LcX9ylgRLNI6kK0pB*JeT+Vk2ToA5@QQq-%
zX2esXbvC>$HsIMe86lpilFk?hr;LLetI0@&VF+NL^1o0-r^f<=9<?ly9Squns+$R;
zCa*$78i^3faE+3jHw}6W4Pn()`ezJfa-OYX#uhc@ym?K=DAid`x~fBQzdBVs%#pDx
zBN7-twj1UUTW&j5Vv%tN#`Du{CG+ZXzPRyu8r!YJ&vb5f$f^wPjUDdsgVH0N?MJtq
z#f}m3Z0CkuI!Nb2p{QxPmpGccIqaIOgxzIHyq71F^~<`Y_1H-~f|j^0ID)*c4xb?v
z@8>(yMboW!Il`-C@1Rkaul{{kbxu5h(k|K37DyNCLVh8L4!9dL#_ht!2Bi@g$BRw9
z8A;TVc{-txhYOdwN%U7DRf*&&W4CQCO5qRP(Qk=Umv{+}@~L7r3PW%vwz`tfh1?|W
z4mFVYHx=qH(xE|NSjMeXA(;!s@T^tnOBETvrO)_o&O0R`k}B5u>!Yw%?nvz>6<w>E
zQbo$YDN5B!C+T6uQA#kAgeD33Cg*Y}=8>(RcnXTFGp(_GSV4Y%zqzb>Gx#`<wtKs}
zj`JUdRx8Vi*0@1g;H&If`3)&wpXzWnwZ~KK33qe{MdJl@nV)J43kBtOof-=a$@n!d
z`>b4$3&1q{vKJT$P#RKS{=iB#G=-+UZ)dLiMh+?Dac(2OtGVkwkp@S0g%kZr^R-_5
zsj>Dyq{2OM5P!U;tK^Dq3dh5V@QH~R4_0MQ0&A)}>r{7qM78-pnO0d_*GEI2`vOoy
mi@sBEFX|DxU>T)^b~}I;Abucl_wx9hN4ZfD_DoEV`~Cr7fn(_a

delta 1392
zcmZ8hZA@Eb6uuwrEtP)Ve%xNz2HX|c1>-<(%Ur{{O&4*%*bEExBT`HjIyL(+m_Uas
zRZQj*HIO$kkw{GVxgQcXLlb|s!%KEY-X)mbjx7G@qBUL27+Py?(5UD3LpT4tIp;ag
zbKY~#J@-u{s6>LANs+U&=})LRD>^|okwx?l*+AYwGo)a=!vBGn&@$QI5b$Wkm}Uqb
zX9#+jBVs5rF{cp&3=vjkd<Hd9^{peGdx}s<brE>O!hX-F0^!SHmCGAgi&+)iPvjQu
zMeM&eLM@uf0&-Y-b_1Ex$+sa+G*-yp)~W)-<OCC)!+sRA>?2R3C5tBvWD<|rLZ)nA
z=!0zU%BMD*bK|0$Ato}e&OIzaz$Ii(mKKW=_Van>afIdajDf$sb?Em*_K?DUL8(G>
zD_n_oS&xz}C~DnfKd2Goy!~RPsfp2uu4XiEZQiRV;yI1T2_%`*%<-b6F>qi#oksd;
zfRZ;4T45xzich15);huG$s07s>nG(<O;J*{w)V)7iZ6Kb#`K#bvYNx6qc+>qem${L
zEm1R#?j>@iqze0|0j9xLrm+*|$kvt}1tHsW?rmGz!WVGAeNlLr+C2{4vITVCHsw6;
zlHeO{Z>FHU7}(?(nzz;0w;z8&#y>dIlS$FrYR*Z}0UZnvt9S!_W#`BZB->laDEisH
zYbxr_)3NSug8?`O=u(z&1?tx5Vc(!zElMENv2|550Yfbl%MeJryMgj@g%Vpe4!U&>
zuxj+7m4vZXrVQyfR3VeD>eW4iqEUL_4X0ExSk<B8UN%qv3*&8@-aYhv%b~&y^!e(m
zrCIYP;g?iAQ}>+>-F5uf8HL?j>2+#EJSmDH<7^MiCV8{hIZ-+e6eZz73a%QEHFNvu
zIUGfsYyc+F?CgA2mkOIHe>`Kn`yLCtk~I!xD8jF>h;YP{H@b*&iSIkhCE|Ycu~Rm;
z`Qn)xv56PZtF8ug(N*UNC9<udzq2i&@ock#r(NhXSL4)-3kSH#pAzs(Z5L8W(FNxL
zaR;1#QQ}(}T0F<UE8})5J+UOdjjvny(X~ObR@K-0BZsuk?_YaOw5TDn>bI>uulsb>
zuUqTWeX8o4*TzJniia%gunP5T!zltbmb=G0Aio8NDBc7H4F>#ID_^6-ZrPG_rxjT<
zzzX3z$m!|p(49zoSO?}k<yghN4DN+XosPzi@MK5C6?%%I@jSZaxm5cipH_-0HwE3I
zQ=UL)fLjo^mHQes>>HBtG{-z6r{y$ZygtSex<M#ACa>OLqzZZ&O>-YkEqh-%p=k8*
zlknuMEPDl-IJrL<8Hky_?7`pYvHu|@?%8AbYE@UV70nn72P46=(Idyovd4j{YU>fz
zmKRhz|C1F;u}AV0(1O<oFWRd2JoysZ#|OyY&>6nNO4bm<0?$53;W@W*ZHYe`{RacD
BNlX9$

diff --git a/make.bat b/make.bat
index 954cdc1..b885b6f 100644
--- a/make.bat
+++ b/make.bat
@@ -1,11 +1,2 @@
 lcc -Wa-l -Wl-m -Wf--debug -Wl-y -Wl-w -c -o game.o ./src/main.c 
-lcc -Wa-l -Wl-m -Wf--debug -Wl-y -Wl-w -o 2048.gb game.o
-
-@REM del *.o
-@REM del *.map
-@REM del *.lst
-@REM del *.sym
-@REM del *.asm
-@REM del *.cdb
-@REM del *.ihx
-@REM del *.adb
\ No newline at end of file
+lcc -Wa-l -Wl-m -Wf--debug -Wl-y -Wl-w -o 2048.gb game.o
\ No newline at end of file
diff --git a/src/board.h b/src/board.h
index 36e3ad0..973dcfd 100644
--- a/src/board.h
+++ b/src/board.h
@@ -25,6 +25,7 @@ UINT8 row = 0;
 UINT8 col = 0;
 UINT16 score = 0;
 UINT8 filled_blocks = 0;
+
 UBYTE moved = 0;
 UBYTE winner = 0;
 
diff --git a/src/config.h b/src/config.h
index dd12485..ca47ab3 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,18 +1,15 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define BUTTON_DELAY 100 // add delay between button presses
-#define SCREEN_DELAY 150
-
 // screen in 8px chunks
 #define GRID_HEIGHT 18
 #define GRID_WIDTH 20
 
 // window states
 #define WIN_X 7
-#define PLAY_WIN_Y 130
-#define TUT_WIN_Y 10
-#define SPLASH_WIN_Y 80
+#define WIN_FOOTER 130
+#define WIN_HALF_SCREEN 80
+#define WIN_FULL_SCREEN 0
 
 // logo
 #define LOGO_SIZE 35
diff --git a/src/font.h b/src/font.h
index 2da2b02..9efe529 100644
--- a/src/font.h
+++ b/src/font.h
@@ -53,12 +53,12 @@ const unsigned char font_tiles[] =
 #define BKG 1
 
 // font settings
-#define FONT_MEMORY_START 36
+#define FONT_MEMORY_START (LOGO_SIZE)
 #define FONT_SIZE 38
 #define FONT_CHAR_START (1 + FONT_MEMORY_START)
 #define FONT_NUM_START (27 + FONT_MEMORY_START)
 #define FONT_EXTRA (36 + FONT_MEMORY_START)
-#define FONT_BLANK (0 + FONT_MEMORY_START)
+#define FONT_BLANK (FONT_MEMORY_START)
 
 
 void setup_font(void);
diff --git a/src/main.c b/src/main.c
index 5f829d9..8a6430e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,7 +5,6 @@
 #include "screens.c"
 #include "font.c"
 #include "board.c"
-#include "sounds.c"
 
 
 /**
@@ -13,7 +12,6 @@
  * 
  */
 void setup(){
-    enable_sound();
     SHOW_BKG;
     SHOW_WIN;
     SHOW_SPRITES;
@@ -24,47 +22,43 @@ void setup(){
 
 
 void main() {
-    UINT8 button_pressed = 0;
+    UINT8 btn = 0;
 
     setup();
 
     while (1) {
-        button_pressed = joypad();
+        btn = waitpad(J_A | J_B | J_UP | J_DOWN | J_LEFT | J_RIGHT | J_START);
+        waitpadup();
 
     	switch (state){
             case TITLE:
                 seed_rand();
-                if(button_pressed & J_START) {
+                if(btn == J_START) {
                     show_play_screen();
                 }
                 break;
                 
             case PLAYING:
-                if(button_pressed & J_UP){
+                if(btn == J_UP){
                     update_board(UP);
-                }else if(button_pressed & J_DOWN){
+                }else if(btn == J_DOWN){
                     update_board(DOWN);
-                }else if(button_pressed & J_RIGHT){
+                }else if(btn == J_RIGHT){
                     update_board(RIGHT);
-                }else if(button_pressed & J_LEFT){
+                }else if(btn == J_LEFT){
                     update_board(LEFT);
-                }else if(button_pressed & J_SELECT){
-                    show_win_screen();
                 }
 
-                if(button_pressed){
-                    delay(BUTTON_DELAY);
-                }
                 break;
 
             case WINNER:
-                if(button_pressed & J_START){
+                if(btn == J_START){
                     show_title_screen();
                 }
                 break;
 
             case GAMEOVER:
-                if(button_pressed & J_START){
+                if(btn == J_START){
                     show_title_screen();
                 }
                 break;
diff --git a/src/sounds.c b/src/sounds.c
deleted file mode 100644
index f141ae8..0000000
--- a/src/sounds.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "sounds.h"
-
-/**
- * @brief Enable sound registers and set volume
- * 
- */
-void enable_sound(void){
-	// turn on sound
-	NR52_REG = 0x80; // turn on sound registers
-	NR51_REG = 0xFF; // set all chanels
-	NR50_REG = 0x77;
-}
-
diff --git a/src/sounds.h b/src/sounds.h
deleted file mode 100644
index b036bbc..0000000
--- a/src/sounds.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef SOUNDS_H
-#define SOUNDS_H
-
-#include <gb/gb.h>
-
-void enable_sound(void);
-
-#endif
\ No newline at end of file