From 552c97286af47b1ee617017c526b9674d517f954 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Wed, 8 Nov 2023 23:44:15 +0100 Subject: [PATCH] Add more breakpoints, also fix data entry typo. --- bin/DMGTRIS.GBC | Bin 131072 -> 131072 bytes bin/DMGTRIS.map | 58 ++++++++++++++++++++--------------------- bin/DMGTRIS.pocket | Bin 131072 -> 131072 bytes bin/DMGTRIS.sym | 50 +++++++++++++++++------------------ src/res/other_data.inc | 58 ++++++++++++++++++++++++++++++++++------- 5 files changed, 103 insertions(+), 63 deletions(-) diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 68d278019d5eb34c4612a7f470d8fd8302a52708..1d14ceb1921e01eff311cc42c1ce1f7d79502750 100644 GIT binary patch delta 472 zcmYk0!7Bt&9LIm}&6~Gx7c)ESH4SRb<3e`JL5`AHv$muy7fNyvC8hiYQ;UO>+TtYc zQZk8yi#9Qb&4HZ!1tbSbHcg(L-P+Ul_v!ch^!s`q^E`GogYd|ZUqqy@=gzUZ#ItL0 zv6Q!TQOR2g@t(6(ku3Nd{V#Eru}5p_aj2DNvo6iNlH)PWKg#al39}%;L!eZzh7EIC zKnX#IoGSxB(Sy;lt({gw!`2ORrS-@#=l#{;%M|)9_d1(dpmP{v9Mb7zdJtmQ7+4dS ztw6j9@ht_C{;o5HrT92`p-&S?afrp3P9b$h$_K8!z6^jlXso@P0=@@O{-MpJpkxpb z4vZyI6v!R|HBwbjzYtIklro((yF}3F5<#O&1W}g{_Yie9-*C>-yohV^r@uY*GkWf6 zrG;B32(eAjlN*GJ%*A{V5}7wLRhe(O0BMDwc2W(&CW4IzA(GiPQP;$0uC9p}sY^|) QM4G5Nfe0?w6tw^Q2m9!7zW@LL delta 358 zcmZo@;Am*z*x<*=wCcy^07e!i>B-I#l8TGmBt#T{xJmFUM!QRJDeiQUU{&n%*qpC? zhm%7^!R#07f`43-gLU25R9>+xu;bc1U$>3PX^Mv;LjxlN^VuB+f>XQ|8JZaxc!BK0 z8VqcV=LL~uf2}?HPf&qha7rq&BEcyUo6`-p3o*W*Ebm;j`KYra6OhU7ww3<{GlP%_ z13NnhKO2M43+BnE-4rYs7#NsD82C7Nq}UjkfE;EJhg*z|ff>kQ5na+hC6j&5F98UgY1k&72U~P)~UBKEDS3tBW{sYoLZHhCUPbwyE K&thhr_6Gnyv}id1 diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map index 03f2b4f..d7b2160 100644 --- a/bin/DMGTRIS.map +++ b/bin/DMGTRIS.map @@ -466,38 +466,38 @@ ROM0 bank #0: ROMX bank #1: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"] - SECTION: $4008-$7293 ($328c bytes) ["Static Global data"] + SECTION: $4008-$7315 ($330e bytes) ["Static Global data"] $4008 = sDMGTSpeedCurve $4203 = sDMGTSpeedCurveEnd $4205 = sDMGTSpeedCurveSpecialData $420b = sTGM1SpeedCurve - $4391 = sTGM1SpeedCurveEnd - $4393 = sTGM1SpeedCurveSpecialData - $4399 = sCHILSpeedCurve - $44b7 = sCHILSpeedCurveEnd - $44b9 = sCHILSpeedCurveSpecialData - $44bf = sTGM3SpeedCurve - $46a0 = sTGM3SpeedCurveEnd - $46a2 = sTGM3SpeedCurveSpecialData - $46a8 = sDEATSpeedCurve - $46f6 = sDEATSpeedCurveEnd - $46f8 = sDEATSpeedCurveSpecialData - $46fe = sSHIRSpeedCurve - $4759 = sSHIRSpeedCurveEnd - $475b = sSHIRSpeedCurveSpecialData - $4761 = sMYCOSpeedCurve - $488c = sMYCOSpeedCurveEnd - $488e = sMYCOSpeedCurveSpecialData - $4894 = sSharedTiles - $4b94 = sTitleTiles - $4b94 = sSharedTilesEnd - $5894 = sTitleTilesEnd - $5894 = sGameplayTilesM - $6594 = sGameplayTilesMEnd - $6594 = sGameplayTilesC - $7294 = sGameplayTilesCEnd - EMPTY: $7294-$7fff ($0d6c bytes) - TOTAL EMPTY: $0d6c bytes + $43c5 = sTGM1SpeedCurveEnd + $43c7 = sTGM1SpeedCurveSpecialData + $43cd = sCHILSpeedCurve + $44eb = sCHILSpeedCurveEnd + $44ed = sCHILSpeedCurveSpecialData + $44f3 = sTGM3SpeedCurve + $46d4 = sTGM3SpeedCurveEnd + $46d6 = sTGM3SpeedCurveSpecialData + $46dc = sDEATSpeedCurve + $475e = sDEATSpeedCurveEnd + $4760 = sDEATSpeedCurveSpecialData + $4766 = sSHIRSpeedCurve + $47c1 = sSHIRSpeedCurveEnd + $47c3 = sSHIRSpeedCurveSpecialData + $47c9 = sMYCOSpeedCurve + $490e = sMYCOSpeedCurveEnd + $4910 = sMYCOSpeedCurveSpecialData + $4916 = sSharedTiles + $4c16 = sTitleTiles + $4c16 = sSharedTilesEnd + $5916 = sTitleTilesEnd + $5916 = sGameplayTilesM + $6616 = sGameplayTilesMEnd + $6616 = sGameplayTilesC + $7316 = sGameplayTilesCEnd + EMPTY: $7316-$7fff ($0cea bytes) + TOTAL EMPTY: $0cea bytes ROMX bank #2: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_SFX"] @@ -2512,7 +2512,7 @@ HRAM bank #0: SUMMARY: ROM0: 12620 bytes used / 3764 free - ROMX: 57326 bytes used / 40978 free in 6 banks + ROMX: 57456 bytes used / 40848 free in 6 banks SRAM: 14 bytes used / 8178 free in 1 bank WRAM0: 3524 bytes used / 572 free HRAM: 124 bytes used / 3 free diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 8fb11080bcb4145213075c2f9725097b514ba52e..ce9f76c2bfc91ae6448ec66e7fdc0eafab090f23 100644 GIT binary patch delta 472 zcmYk0!7Bt&9LIm}&6~Gx*V@?`uW3+Y9v5o2lya2Jn%yl)xlodWC@JMHm|7g1)D|ak zmy$^wTqH4v$$^~w1tbSbHccL5%jx_3^!t7KeSM$#K06vmcwiuyK%~3#+O^ungJ*Fu zSGF{9S++9brDUlhUkz4z9@DJg3^vsLI9s1AdbIFF_J^{;UU37Dm{kEj0wp@@*Ud2j zH3Y44zU&2xZuNiL#$goej;5On|BrNYI#}#KHPA=B%Uvx3ox+gfVB2}S4^rnCSQD6| zK)MO(H3jm)rdz>Myc<2y#t0Z3QYofUFpfxl$8(nF0WgOg%XUz}Hvq~Hw3rl>0s_K; zv5Y~1Y#~q+RR#4O0p&m`(@3*R0)Jf+`0J8D(&g3LMQzPDoHLtG;D-DetXDn=1PCg|Q-Ywj9Pp=7mgE=5r}TxoX%rh+=SvV8daIWVVd_YT~W*tBFUcOHC{! Pnuy#`gr`di+Wz_m0xxjF delta 358 zcmZo@;Am*z*x<*=wDRBP07e!i>B-I#l8TGmBt#T{xJmFUM!QRJDeiQUU{&n%*qpC? zhm%7^!R#07f`9CjgLU25R9>+xuw&mmU$>3PX^Mv;LjxlN^VuB+f>XQ|8JZaxc!BK0 z8VqcV=LL~uf2}?HPf&qha7rq&BEcyUo6`-p3o*W*Ebm;j`KYra6OhU7ww3<{GlP%_ z13NnhKO2M43+BnE-4rYs7#NsD82C7Nq}UjkfE;EJhg*z|ff>kQ5na+hC6j&5F98UgY1k&72U~P)~UBKEDS3tBW{sYoLZHhCUPbwyE K&thhr_6GnylV~^q diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym index 833565f..ada721d 100644 --- a/bin/DMGTRIS.sym +++ b/bin/DMGTRIS.sym @@ -352,31 +352,31 @@ 01:4203 sDMGTSpeedCurveEnd 01:4205 sDMGTSpeedCurveSpecialData 01:420b sTGM1SpeedCurve -01:4391 sTGM1SpeedCurveEnd -01:4393 sTGM1SpeedCurveSpecialData -01:4399 sCHILSpeedCurve -01:44b7 sCHILSpeedCurveEnd -01:44b9 sCHILSpeedCurveSpecialData -01:44bf sTGM3SpeedCurve -01:46a0 sTGM3SpeedCurveEnd -01:46a2 sTGM3SpeedCurveSpecialData -01:46a8 sDEATSpeedCurve -01:46f6 sDEATSpeedCurveEnd -01:46f8 sDEATSpeedCurveSpecialData -01:46fe sSHIRSpeedCurve -01:4759 sSHIRSpeedCurveEnd -01:475b sSHIRSpeedCurveSpecialData -01:4761 sMYCOSpeedCurve -01:488c sMYCOSpeedCurveEnd -01:488e sMYCOSpeedCurveSpecialData -01:4894 sSharedTiles -01:4b94 sTitleTiles -01:4b94 sSharedTilesEnd -01:5894 sTitleTilesEnd -01:5894 sGameplayTilesM -01:6594 sGameplayTilesMEnd -01:6594 sGameplayTilesC -01:7294 sGameplayTilesCEnd +01:43c5 sTGM1SpeedCurveEnd +01:43c7 sTGM1SpeedCurveSpecialData +01:43cd sCHILSpeedCurve +01:44eb sCHILSpeedCurveEnd +01:44ed sCHILSpeedCurveSpecialData +01:44f3 sTGM3SpeedCurve +01:46d4 sTGM3SpeedCurveEnd +01:46d6 sTGM3SpeedCurveSpecialData +01:46dc sDEATSpeedCurve +01:475e sDEATSpeedCurveEnd +01:4760 sDEATSpeedCurveSpecialData +01:4766 sSHIRSpeedCurve +01:47c1 sSHIRSpeedCurveEnd +01:47c3 sSHIRSpeedCurveSpecialData +01:47c9 sMYCOSpeedCurve +01:490e sMYCOSpeedCurveEnd +01:4910 sMYCOSpeedCurveSpecialData +01:4916 sSharedTiles +01:4c16 sTitleTiles +01:4c16 sSharedTilesEnd +01:5916 sTitleTilesEnd +01:5916 sGameplayTilesM +01:6616 sGameplayTilesMEnd +01:6616 sGameplayTilesC +01:7316 sGameplayTilesCEnd 02:4008 sSFXPieceI 02:4325 sSFXPieceZ 02:4325 sSFXPieceIEnd diff --git a/src/res/other_data.inc b/src/res/other_data.inc index f06511a..2e32d62 100644 --- a/src/res/other_data.inc +++ b/src/res/other_data.inc @@ -282,7 +282,7 @@ sTGM1SpeedCurve:: db 1, 192 db 30, 30, 16, 30, 41 - dw $0247, 239, $0300 + dw $0247, 247, $0300 db 1, 224 db 30, 30, 16, 30, 41 @@ -318,6 +318,22 @@ sTGM1SpeedCurve:: db 20, $00 db 30, 30, 16, 30, 41 + dw $0600, 600, $0700 + db 20, $00 + db 30, 30, 16, 30, 41 + + dw $0700, 700, $0800 + db 20, $00 + db 30, 30, 16, 30, 41 + + dw $0800, 800, $0900 + db 20, $00 + db 30, 30, 16, 30, 41 + + dw $0900, 900, $1000 + db 20, $00 + db 30, 30, 16, 30, 41 + sTGM1SpeedCurveEnd:: dw $FFFF @@ -510,7 +526,7 @@ sTGM3SpeedCurve:: db 1, 192 db 27, 27, 16, 30, 40 - dw $0247, 239, $0300 + dw $0247, 247, $0300 db 1, 224 db 27, 27, 16, 30, 40 @@ -566,11 +582,11 @@ sTGM3SpeedCurve:: db 20, $00 db 8, 8, 8, 17, 6 - dw $1100, 1000, $1200 + dw $1100, 1100, $1200 db 20, $00 db 7, 7, 8, 15, 6 - dw $1200, 1000, $1300 + dw $1200, 1200, $1300 db 20, $00 db 6, 6, 8, 15, 6 @@ -587,23 +603,39 @@ sDEATSpeedCurve:: db 20, $00 db 18, 14, 12, 30, 12 - dw $0100, 0, $0200 + dw $0100, 100, $0200 db 20, $00 db 14, 8, 12, 26, 6 - dw $0200, 0, $0300 + dw $0200, 200, $0300 db 20, $00 db 14, 8, 11, 22, 6 - dw $0300, 0, $0400 + dw $0300, 300, $0400 db 20, $00 db 8, 8, 10, 18, 6 - dw $0400, 0, $0500 + dw $0400, 400, $0500 db 20, $00 db 7, 7, 8, 15, 5 - dw $0500, 0, $0600 + dw $0500, 500, $0600 + db 20, $00 + db 6, 6, 8, 15, 4 + + dw $0600, 600, $0700 + db 20, $00 + db 6, 6, 8, 15, 4 + + dw $0700, 700, $0800 + db 20, $00 + db 6, 6, 8, 15, 4 + + dw $0800, 800, $0900 + db 20, $00 + db 6, 6, 8, 15, 4 + + dw $0900, 900, $1000 db 20, $00 db 6, 6, 8, 15, 4 @@ -747,6 +779,14 @@ sMYCOSpeedCurve:: db 20, $00 db 20, 20, 8, 30, 20 + dw $0200, 200, $0300 + db 20, $00 + db 20, 20, 8, 30, 20 + + dw $0250, 250, $0300 + db 20, $00 + db 20, 20, 8, 30, 20 + sMYCOSpeedCurveEnd:: dw $FFFF