From 9386c1bc9821f0aedd6bf902817af2132c90a88e Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Mon, 30 Oct 2023 01:04:19 +0100
Subject: [PATCH] Fix 20G oopsie and clear out unused sprites.

---
 bin/DMGTRIS.GBC        | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.pocket     | Bin 131072 -> 131072 bytes
 src/field.asm          |   8 +--
 src/sprites.asm        | 117 ++++++++++++++++++++++++++---------------
 src/state_gameplay.asm |  12 ++---
 5 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 025ceb2dedf52ed5667dd63b55d735159d6e2e5b..9cfb7c09ba2e5dd1031dff5d222a8554711ef5da 100644
GIT binary patch
delta 3284
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
U^VZ<q!=IxDTOfGk2&`K9AJdl@H2?qr

delta 3257
zcma);4{Q_H9mntaPySlO4z_c4F4UJ8;-*kwYa{-Iix~zJK?(l@Ef4}rL5y}xMI%)y
zF_Z?#7)v<9r4)i0j7eQ5x~8qGRie@CS<je980$czY`u1f!7Y?S8gw(r-tW%m*re-L
zS@-Vy`TgE|_wL>IcjrK$AP^|%+HN<O=NSgcr`|i^v^qTNPWY~~``{MzDz8WLbls!-
z7otC-@g{~tVxwKpQoYDU5jSH;D5#$E(EtLrP`xY_L6m`*`j_bk5TlLAS4KeekskbH
zqtyg+<g=~_TB{>&evy%--ArNwsbhl?<fRH{xE^x)Cb(AE-QQ`vuG8Ih_HQZZ&@1PE
z6?f>H?m9WI)P<u((jlekRhpxiJ0f*ssRv7MVCfi6EF;mY(m|Y9PNJVlhjF5bM8A-Z
z;KWK2{kznMIVACz(@O&84APsJqom{fpGvkj2C%dnM+>FBSlW-dZfPf$_TgxO^g5P)
ziscK^YgpQY<JHky(k@&lbzpf=`U#ePmJW47=m3sM<yd+QOI28^=7VNixf4rcuvCeq
zakz~(!(y`m{-SyO1P88({z$4&TNdvCJr=L~K}~d_L_=($#Hg(cG7BX)|G1?_$8F(%
zV{x?mxw36-(E@e~u6?O$TUAwt>qfA51p73G;anTL5ZCU_9ldk}uNc9rH0Em6;Tv)7
zq1@q{NAQ*ryp^vnZMH8cO{QE`L_IO-lZ`Ck-z#lsZ?(21DOWL9AP#X}@pf3@0PqIj
zc^d10D}iTgybE|1@FI;7@L1qk8t(*l05@u^2QCJlqw#CNe*s=B-fmYfXn?>6IURNb
zR|7BA1{i^#1NLkDI`AvN%QVgd?gO5yaR>0Lz)dPAiva%s*pS9fz!t!jfT)#!IQo}p
zD}T!R^jH&Pscd2A5tL666LW{GwI`A1-$|Y4p7;q^JgIl(leK)(S}`k|Ng6$O#h5gh
zB2(?*sdm47K_v2^c%e-kl;h%g`J5P+W8ygo#bPia{a4P|T;Z|7JZo&s__cO6mOAVC
zXVqDc495^0H|bN*PYJu;R0bU8@?n6BEay+#9veg3V0}+j<^1G}jc5E2EZhcj{>}E1
z$8U$V=24A1cQzK@3Qx0zn{44-w(!%o@KzhyWWQ0LteW&yjBMg}*ng}WD&z0lTk?j=
zICD6{uP%E6MfiPXPmPL{%J2K-w?Fh4xe^lTkC%0zngtF-KP1o|O+h>AJ~VUTpq*T*
zu5il3-`{JS=zn=)qyF0S{40)DnCNrIXnTdrm(T~3cGrxAA(-^IY7@p_(##h*>&z9B
zF38y>eUS4=h9GC=mpdEL1pc&h>Pj0!US!A;3t7jIsDpf5PQIYX1e!cqns}BZEuQ?m
zF4^~?>jAkzk*ySIwUTL8Qcsi5%GvyK`99n|-1-hGynqR>U^0ELrdW6Xl=5+CCcK05
z2FdlM>f6{jNPe+cRS=uAOi`BI40|<&im0%OVW}iKPT46k9wb&Jyef|~Emiyg!@TQd
z2V5p5v5F+EE~n+PkDc9%jEa3MpZeI=wC<UStW6L(F&ts&@2NN9nx1%$#QiYxw2$@m
zB9l7uT_5{>P18=x*__O|oD8LIQP11Rkw;s(FG-{)j>Z|LF=5~P_mD|H-^85pgA?M_
z@#;qQrmt}6YIfoq$e>&S5(U9@;-Q-OVKz~yB?@LMBhI7~!ZQX$Ba`sF0acZl7}{j1
zo6Sx<qRtlTHK4%siEf4soI{(DJrxES#7L&>29TB@X1iiQ%3cPsMbpCV0ICmlcu}hn
z(ZbMd<UvmgA9Wx`m^=rqH};i=cl(9<J!qA1Zw_*!K4D-FT95idJN)PnLRW>4_MsKX
zDQs>)PDt))K%U~OcA1D5l{%zDzimMGbjU5dGau34bu)5zGNmr#eyVT=ybHgAXKUXM
zA4~b*e@lejp$GF(i?PC#@nN8ZyDs|0xm=gnK#p2Tf+n59%ZpJtEWT$ks$T$)z(SyE
zuFP=daeDDG=Mk@1K5k~m$KX=1<>BgPC1>RF#LH(O6?-Jb6^fV1STC9DP2Yl0xda_U
zk<h>r6fDZmTyMh~RN*j}%Qushr&PWLtx5g|w0TeiVY6^-4RW@F&HmWTUc<<$S_!nA
zqYbfaoX*j(%HjUr9KAG0Z_Lr#HBD18Ay-P|Pe_lMorEnP*iz&P3w-1(zf#3UY&io$
znAePI6qk0Ai166Y(O7d@m(s-qR1t}U-f2b~UG3nUG3ODc?8;xAulq^)Bcxc%2-Z^M
zTUq&DR-VmDoRycd5_Tsu!;P$jeOjIgC$eGKvP^VTR>J0GqLsrk_6=SSf!9wB+x(7V
z^L8-p^gU?zu(1U&_T!;v_M#Uu?jGZG$h==Z6bM|_iHGC^GsFW)>UW<nA|3O&V$vr}
z?nE`Yo)^IL<3js8(XWx>_%6lR@LY!-59?JOua?5s6T;^GP~xibeMTYHjVcu{UBc|$
zINYl8Lc509`x$)$vkx*_#w>MS>yyB&F{2GJwkV@V#n_UJremx%qbp;qL(_?&I6VBy
zZL9~H#O*j6+H?@{y8lyy&K|V}YkR(_2G_4+cb(U2Fy8V=4ZiS5O0B_3Uh-w82E#pS
z4YnLcC$lwJeByuB;LH>08r-&y{myx<ra;fh(a+}S7jrbMGF^kv|8S0eD@UKr(U&y+
UZENt(iEmMZjVN^TBwD@dKWzgF1poj5

diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 08c0011bffdf37a1e2b32be2b9add8e4c6fde74d..69ee11ef624fce51108a8dd6d16768eecb322a2a 100644
GIT binary patch
delta 3284
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
UWoz)xp)XN`%@90%7*?+M52v>nssI20

delta 3257
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
Vf8QFsef)dWU?U2iIDuBJ{0|IQ3U&Yh

diff --git a/src/field.asm b/src/field.asm
index 8a128b1..e1364ad 100644
--- a/src/field.asm
+++ b/src/field.asm
@@ -1281,7 +1281,7 @@ FieldProcess::
     ld b, a
     ldh a, [hCurrentIntegerGravity]
     cp a, 20            ; No increased DAS at 20G.
-    jr z, .wantright
+    jr z, .checkdasleft
     ldh a, [hGrounded]  ; If we're grounded, assume some urgency in getting DAS charged, charge at twice the rate.
     cp a, $FF
     jr nz, .checkdasleft
@@ -1310,7 +1310,7 @@ FieldProcess::
     ld b, a
     ldh a, [hCurrentIntegerGravity]
     cp a, 20            ; No increased DAS at 20G.
-    jr z, .donemanipulating
+    jr z, .checkdasright
     ldh a, [hGrounded]  ; If we're grounded, assume some urgency in getting DAS charged, charge at twice the rate.
     cp a, $FF
     jr nz, .checkdasright
@@ -3341,7 +3341,7 @@ BigFieldProcess::
     ld b, a
     ldh a, [hCurrentIntegerGravity]
     cp a, 20            ; No increased DAS at 20G.
-    jr z, .wantright
+    jr z, .checkdasleft
     ldh a, [hGrounded]  ; If we're grounded, assume some urgency in getting DAS charged, charge at twice the rate.
     cp a, $FF
     jr nz, .checkdasleft
@@ -3370,7 +3370,7 @@ BigFieldProcess::
     ld b, a
     ldh a, [hCurrentIntegerGravity]
     cp a, 20            ; No increased DAS at 20G.
-    jr z, .wantright
+    jr z, .checkdasright
     ldh a, [hGrounded]  ; If we're grounded, assume some urgency in getting DAS charged, charge at twice the rate.
     cp a, $FF
     jr nz, .checkdasright
diff --git a/src/sprites.asm b/src/sprites.asm
index f715ec4..fe6a14d 100644
--- a/src/sprites.asm
+++ b/src/sprites.asm
@@ -24,48 +24,48 @@ INCLUDE "globals.asm"
 
 SECTION "Shadow OAM", WRAM0, ALIGN[8]
 UNION
-wShadowOAM:: ds 160
+wShadowOAM::   ds 160
 NEXTU
-wSPRNext1:: ds 4
-wSPRNext2:: ds 4
-wSPRNext3:: ds 4
-wSPRNext4:: ds 4
-wUnused0:: ds 4
-wUnused1:: ds 4
-wSPRHold1:: ds 4
-wSPRHold2:: ds 4
-wSPRHold3:: ds 4
-wSPRHold4:: ds 4
-wUnused2:: ds 4
-wUnused3:: ds 4
-wSPRScore1:: ds 4
-wSPRScore2:: ds 4
-wSPRScore3:: ds 4
-wSPRScore4:: ds 4
-wSPRScore5:: ds 4
-wSPRScore6:: ds 4
-wUnused4:: ds 4
-wUnused5:: ds 4
-wSPRCLevel1:: ds 4
-wSPRCLevel2:: ds 4
-wSPRCLevel3:: ds 4
-wSPRCLevel4:: ds 4
-wUnused6:: ds 4
-wUnused7:: ds 4
-wSPRNLevel1:: ds 4
-wSPRNLevel2:: ds 4
-wSPRNLevel3:: ds 4
-wSPRNLevel4:: ds 4
-wUnused8:: ds 4
-wUnused9:: ds 4
-wSPRQueue1A:: ds 4
-wSPRQueue1B:: ds 4
-wSPRQueue2A:: ds 4
-wSPRQueue2B:: ds 4
-wSPRModeRNG:: ds 4
-wSPRModeRot:: ds 4
+wSPRNext1::    ds 4
+wSPRNext2::    ds 4
+wSPRNext3::    ds 4
+wSPRNext4::    ds 4
+wSPRHold1::    ds 4
+wSPRHold2::    ds 4
+wSPRHold3::    ds 4
+wSPRHold4::    ds 4
+wSPRScore1::   ds 4
+wSPRScore2::   ds 4
+wSPRScore3::   ds 4
+wSPRScore4::   ds 4
+wSPRScore5::   ds 4
+wSPRScore6::   ds 4
+wSPRCLevel1::  ds 4
+wSPRCLevel2::  ds 4
+wSPRCLevel3::  ds 4
+wSPRCLevel4::  ds 4
+wSPRNLevel1::  ds 4
+wSPRNLevel2::  ds 4
+wSPRNLevel3::  ds 4
+wSPRNLevel4::  ds 4
+wSPRQueue1A::  ds 4
+wSPRQueue1B::  ds 4
+wSPRQueue2A::  ds 4
+wSPRQueue2B::  ds 4
+wSPRModeRNG::  ds 4
+wSPRModeRot::  ds 4
 wSPRModeDrop:: ds 4
-wSPRModeHiG:: ds 4
+wSPRModeHiG::  ds 4
+wUnused0::     ds 4
+wUnused1::     ds 4
+wUnused2::     ds 4
+wUnused3::     ds 4
+wUnused4::     ds 4
+wUnused5::     ds 4
+wUnused6::     ds 4
+wUnused7::     ds 4
+wUnused8::     ds 4
+wUnused9::     ds 4
 ENDU
 
 
@@ -101,11 +101,11 @@ CopyOAMHandler::
     ; Clears OAM and shadow OAM.
 ClearOAM::
     ld hl, _OAMRAM
-    ld bc, $9F
+    ld bc, 160
     ld d, 0
     call SafeMemSet
     ld hl, wShadowOAM
-    ld bc, $9F
+    ld bc, 160
     ld d, 0
     jp UnsafeMemSet
 
@@ -366,7 +366,7 @@ ApplyHold::
     ; Generic function to draw a BCD number (6 digits) as 6 sprites.
     ; Address of first sprite in hl.
     ; Address of first digit in de.
-ApplyNumbers::
+ApplyNumbers6::
     inc hl
     inc hl
     ld bc, 4
@@ -406,6 +406,37 @@ ApplyNumbers::
     ld [hl], a
     ret
 
+    ; Generic function to draw a BCD number (4 digits) as 4 sprites.
+    ; Address of first sprite in hl.
+    ; Address of first digit in de.
+ApplyNumbers4::
+    inc hl
+    inc hl
+    ld bc, 4
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    add hl, bc
+    inc de
+
+    ld a, [de]
+    add a, TILE_0
+    ld [hl], a
+    ret
+
 
     ; Positions all number sprites for gameplay.
 SetNumberSpritePositions::
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index 14d038c..93e0611 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -603,15 +603,15 @@ drawStaticInfo:
 
     ld hl, wSPRScore1
     ld de, hScore
-    call ApplyNumbers
+    call ApplyNumbers6
 
     ld hl, wSPRCLevel1
     ld de, hCLevel
-    call ApplyNumbers
+    call ApplyNumbers4
 
     ld hl, wSPRNLevel1
     ld de, hNLevel
-    call ApplyNumbers
+    call ApplyNumbers4
 
     jp GBCGameplayProcess
 
@@ -1212,15 +1212,15 @@ GamePlayBigEventLoopHandlerB:
 
     ld hl, wSPRScore1
     ld de, hScore
-    call ApplyNumbers
+    call ApplyNumbers6
 
     ld hl, wSPRCLevel1
     ld de, hCLevel
-    call ApplyNumbers
+    call ApplyNumbers4
 
     ld hl, wSPRNLevel1
     ld de, hNLevel
-    call ApplyNumbers
+    call ApplyNumbers4
 
     jp GBCBigGameplayProcess