From e66468a68c5acc1eccaa86175de0cfd982c6cbda Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Thu, 9 Nov 2023 21:55:30 +0100 Subject: [PATCH] Remove accidental breakpoint. --- 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 | 4 --- 5 files changed, 54 insertions(+), 58 deletions(-) diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 83a148ac88f3bda7d366229be8bcdc4b4f237f3b..6bef17653de40d35703a0364bb610699e0b74ce1 100644 GIT binary patch delta 258 zcmZo@;Am*z*x<*=^r~cY0OL-1sdLT}l8Ue0Bt#Tz+$H!GpSeqLDgJhmU{$o*tgNWb z$6>Bu_KS7FKiSD)`fhCIuUHn?$!=bx|Bunp-BXdFfsujvtg(@xyN@D6Ga~~pkbPK# zfsOIJAd>8_184sUD)0-sry(m6bl?2Y@U`IPo6hPslRp^oZff9bjy>ai@*k4|3*$?- zlmD23bd~$be=I=y36N$5(m!2JGFo_^{I&1wKL!OBMGl9P{}_R^kP}#&B8Mwjo8k|k ZcAz%JPKY+e+s-EyKf7 XrZ^3vP4R{ENks;a?b*zXQ~v+}-#1jT diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map index a85621c..fd5d377 100644 --- a/bin/DMGTRIS.map +++ b/bin/DMGTRIS.map @@ -476,38 +476,38 @@ ROM0 bank #0: ROMX bank #1: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"] - SECTION: $4008-$7353 ($334c bytes) ["Static Global data"] + SECTION: $4008-$7346 ($333f bytes) ["Static Global data"] $4008 = sDMGTSpeedCurve $4203 = sDMGTSpeedCurveEnd $4205 = sDMGTSpeedCurveSpecialData $4212 = sTGM1SpeedCurve - $43d9 = sTGM1SpeedCurveEnd - $43db = sTGM1SpeedCurveSpecialData - $43e8 = sCHILSpeedCurve - $4506 = sCHILSpeedCurveEnd - $4508 = sCHILSpeedCurveSpecialData - $4515 = sTGM3SpeedCurve - $46f6 = sTGM3SpeedCurveEnd - $46f8 = sTGM3SpeedCurveSpecialData - $4705 = sDEATSpeedCurve - $4787 = sDEATSpeedCurveEnd - $4789 = sDEATSpeedCurveSpecialData - $4796 = sSHIRSpeedCurve - $47f1 = sSHIRSpeedCurveEnd - $47f3 = sSHIRSpeedCurveSpecialData - $4800 = sMYCOSpeedCurve - $4945 = sMYCOSpeedCurveEnd - $4947 = sMYCOSpeedCurveSpecialData - $4954 = sSharedTiles - $4c54 = sTitleTiles - $4c54 = sSharedTilesEnd - $5954 = sTitleTilesEnd - $5954 = sGameplayTilesM - $6654 = sGameplayTilesMEnd - $6654 = sGameplayTilesC - $7354 = sGameplayTilesCEnd - EMPTY: $7354-$7fff ($0cac bytes) - TOTAL EMPTY: $0cac bytes + $43cc = sTGM1SpeedCurveEnd + $43ce = sTGM1SpeedCurveSpecialData + $43db = sCHILSpeedCurve + $44f9 = sCHILSpeedCurveEnd + $44fb = sCHILSpeedCurveSpecialData + $4508 = sTGM3SpeedCurve + $46e9 = sTGM3SpeedCurveEnd + $46eb = sTGM3SpeedCurveSpecialData + $46f8 = sDEATSpeedCurve + $477a = sDEATSpeedCurveEnd + $477c = sDEATSpeedCurveSpecialData + $4789 = sSHIRSpeedCurve + $47e4 = sSHIRSpeedCurveEnd + $47e6 = sSHIRSpeedCurveSpecialData + $47f3 = sMYCOSpeedCurve + $4938 = sMYCOSpeedCurveEnd + $493a = sMYCOSpeedCurveSpecialData + $4947 = sSharedTiles + $4c47 = sTitleTiles + $4c47 = sSharedTilesEnd + $5947 = sTitleTilesEnd + $5947 = sGameplayTilesM + $6647 = sGameplayTilesMEnd + $6647 = sGameplayTilesC + $7347 = sGameplayTilesCEnd + EMPTY: $7347-$7fff ($0cb9 bytes) + TOTAL EMPTY: $0cb9 bytes ROMX bank #2: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_SFX"] @@ -2569,7 +2569,7 @@ HRAM bank #0: SUMMARY: ROM0: 12999 bytes used / 3385 free - ROMX: 60149 bytes used / 38155 free in 6 banks + ROMX: 60136 bytes used / 38168 free in 6 banks SRAM: 14 bytes used / 8178 free in 1 bank WRAM0: 3540 bytes used / 556 free HRAM: 124 bytes used / 3 free diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 8e660a613a94fd4334411ac8ad05f5401123d834..18d6d47fbc9c39cd45841b5c9a704361ba992d7a 100644 GIT binary patch delta 258 zcmZo@;Am*z*x<*=^s;7i0OL-1sdLT}l8Ue0Bt#Tz+$H!GpSeqLDgJhmU{$o*tgNWb z$6>Bu_KS7FKk3O~`fhCIuUHn?NpD`H|Bunp-BXdFfsujvtg(@xyN@D6Ga~~pkbPK# zfsOIJAd>8_184sUD)0-sry(m6bl?2Y@U`IPo6hPslRp^oZff9bjy>ai@*k4|3*$?- zlmD23bd~$be=I=y36N$5(m!2JGFo_^{I&1wKL!OBMGl9P{}_R^kP}#&B8Mwjo8k|k ZcAz%JPKY+e+s-EyKf7 XrZ^3vP4R{ENks;a?b*zXQ~v+};^|bh diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym index ed6632f..a2ddbf8 100644 --- a/bin/DMGTRIS.sym +++ b/bin/DMGTRIS.sym @@ -362,31 +362,31 @@ 01:4203 sDMGTSpeedCurveEnd 01:4205 sDMGTSpeedCurveSpecialData 01:4212 sTGM1SpeedCurve -01:43d9 sTGM1SpeedCurveEnd -01:43db sTGM1SpeedCurveSpecialData -01:43e8 sCHILSpeedCurve -01:4506 sCHILSpeedCurveEnd -01:4508 sCHILSpeedCurveSpecialData -01:4515 sTGM3SpeedCurve -01:46f6 sTGM3SpeedCurveEnd -01:46f8 sTGM3SpeedCurveSpecialData -01:4705 sDEATSpeedCurve -01:4787 sDEATSpeedCurveEnd -01:4789 sDEATSpeedCurveSpecialData -01:4796 sSHIRSpeedCurve -01:47f1 sSHIRSpeedCurveEnd -01:47f3 sSHIRSpeedCurveSpecialData -01:4800 sMYCOSpeedCurve -01:4945 sMYCOSpeedCurveEnd -01:4947 sMYCOSpeedCurveSpecialData -01:4954 sSharedTiles -01:4c54 sTitleTiles -01:4c54 sSharedTilesEnd -01:5954 sTitleTilesEnd -01:5954 sGameplayTilesM -01:6654 sGameplayTilesMEnd -01:6654 sGameplayTilesC -01:7354 sGameplayTilesCEnd +01:43cc sTGM1SpeedCurveEnd +01:43ce sTGM1SpeedCurveSpecialData +01:43db sCHILSpeedCurve +01:44f9 sCHILSpeedCurveEnd +01:44fb sCHILSpeedCurveSpecialData +01:4508 sTGM3SpeedCurve +01:46e9 sTGM3SpeedCurveEnd +01:46eb sTGM3SpeedCurveSpecialData +01:46f8 sDEATSpeedCurve +01:477a sDEATSpeedCurveEnd +01:477c sDEATSpeedCurveSpecialData +01:4789 sSHIRSpeedCurve +01:47e4 sSHIRSpeedCurveEnd +01:47e6 sSHIRSpeedCurveSpecialData +01:47f3 sMYCOSpeedCurve +01:4938 sMYCOSpeedCurveEnd +01:493a sMYCOSpeedCurveSpecialData +01:4947 sSharedTiles +01:4c47 sTitleTiles +01:4c47 sSharedTilesEnd +01:5947 sTitleTilesEnd +01:5947 sGameplayTilesM +01:6647 sGameplayTilesMEnd +01:6647 sGameplayTilesC +01:7347 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 9a1c8d0..73acd34 100644 --- a/src/res/other_data.inc +++ b/src/res/other_data.inc @@ -338,10 +338,6 @@ sTGM1SpeedCurve:: db 20, $00 db 30, 30, 16, 30, 41 - dw $0995, 995, $0999 - db 20, $00 - db 30, 30, 16, 30, 41 - sTGM1SpeedCurveEnd:: dw $FFFF