From 8de358d99fcfc3315e605834873f5f1b7cd3bd59 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Tue, 30 Dec 2025 16:35:43 -0600 Subject: [PATCH] (de)compression src fixes and windows binaries --- bin/src/compress.c | 2 ++ bin/src/decompress.c | 2 ++ bin/windows/compress.exe | Bin 0 -> 6656 bytes bin/windows/decompress.exe | Bin 0 -> 5120 bytes dungeonmap.asm | 7 ++++++- menu/drsheetdc.2bpp | Bin 0 -> 2048 bytes tables.asm | 2 +- 7 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 bin/windows/compress.exe create mode 100644 bin/windows/decompress.exe create mode 100644 menu/drsheetdc.2bpp diff --git a/bin/src/compress.c b/bin/src/compress.c index f314537..2bb46e9 100644 --- a/bin/src/compress.c +++ b/bin/src/compress.c @@ -234,4 +234,6 @@ int main(int argc, char *argv[]) { fclose(outptr); printf("Input file: %X bytes. Compressed: %X bytes.\n", size, oloc); + + return 0; } diff --git a/bin/src/decompress.c b/bin/src/decompress.c index 38a2a70..15dcbdd 100644 --- a/bin/src/decompress.c +++ b/bin/src/decompress.c @@ -142,4 +142,6 @@ int main(int argc, char *argv[]) { fclose(outptr); printf("Input file: %X bytes. Decompressed: %X bytes.\n", size, oloc); + + return 0; } diff --git a/bin/windows/compress.exe b/bin/windows/compress.exe new file mode 100644 index 0000000000000000000000000000000000000000..bd9d2fbf015cdc43ec5b48a86f974377cc5296ba GIT binary patch literal 6656 zcmeHLZ){sv6~8Zui<>sJ+pa7h*!nu9QzvM~213iwAQFArvlNS}izQSIrB3pa2E~77 zyKM%V)XMRc$JMI}LI|NE_=40;2%>F>bZo&%if}TDvS~;IfkK^vW z&g+M!w4UpSdQXp}^<*kBoQlTufoMFQ$mso+o;nlPN8~QhnTD zZ18#Vz645dk=^pYo3ZiQ_W#KHA7SkLCUZM8)>sDPljIEjD0akA`{<0F>Ku$_qUfBW zG59J1zX!DD>1Hh7nUsRUcXS9{?KMJR(cK*}?Z28A*1$5;4hKy;(%xemdXF7GGDVo$ z#}&6Pc}&$MT!vot zji6{m(3lNOYk}!jXd3s?)L&LA6=kHvjS_F`JIEN>>G2eoT*al;KL|%kTA@xmkCe2< z4>duktzISN;WcQ!_>l0ngy<-aC2RmTVXT9nDf!*z-vrjSQC#VOgWOolmRbT%D@3Qz zuBbH@T7ie#sq0B}-3<4-Qxn5%N zuwD~JQ3;eb#JpA)bFoduyh2MWfSRA%YS6>?$)Ni&)eQ&Pq~aFYuuBY;RgN_bx}06o zcqFLJngegaS0vnGV0v$0+TXRH63)#A1m7IE_!V-Lx@0yq4j%5nriZP7=b@OTDYjq{++O_e%jN*%G?x@uH;lJ0`54cf#bWr17QY%OTts>>KE z-^wKxL-rhk@V4JK%9TpC#FYCFi>Tk_;Uew- zLugIOeVdnx=0MiH$)A8%x3tjlpKVxJKqa}Qh2L(+!s)G8`1||Yh+zjTaHB{lU!+56 zLumk>HRbSkJKcp2Ky(FDRUrk#szrhpW#fs2B8$2RZ{hyzie`uDsK}NM1};W0 z18M0V5IA(^<+d;2>kw1%6T78%w!LeGn&I z>f|aa_jV)0c(Ciufb#@Qs{L7Xohz=s(^xBJ3BM!lrnZ2?al*e^fMgXG9JEzffCCjS zhYm4VZ8y0eK%0*5^ zVkJZQ;l`Bmvk7vhPh_oaOk(T@kdpNfq0FPE zm;yaO0Z`|F-=yczQB3Axh|ilSC)tK>eels*y#9g5pd>&FVf;yJP)YQku>Y3ELpE$3K=?%kIh z@~W;z{1gk#h2PTdC0Yh9LWAudr?&%FRB^ew{_je~u8ok4ZqzRWsHs7bM*5vxkMN^T zf2^usA>)`3(h9bSf93URWV~$>_i&(=yX|OyMG3m4X#WJ1Z;Dm|txAgkT|s5yuIR|M zjZC`rM20~ZCmBJ@2UzZHELH24oqwRQ^OT*g^MdEbC3t>SR$%Oqc2xTy>ecoAw2|uT z)n(j0Ogr}&>DXAZg4L4sZ86g=h^H_|Zo!|3)e}bP4aFffjrTkf(48K_bneJWH*I^* z=HqoX*Ko0vHa`oSSRZMMbS|%B%w2x9yHLar)Xo19&BsjdfYeEkdSxS!M6C>ZZqiM* zdTgAk6?TlmM&aimZ5!7}4-Xe?6nlYsOWGN~r8eX56dWATScw})i$^uqZ2wz9R zLVq(=YETW-UA7mgmT}(zUaU>tHYmseiwJJ|IBalnKvCkp?+V;!LiVD_wc5*ILaNZE zibGPx15(AZ$(uxx(qJ0!E%O@NpD$5fiN*dDblm(ND32fc{tYLm_aY<0LBhoMDtKVf z4h%jdvPD{4?z4qp+t&p-z=_a7Uhh_^)~zf5tW*e8JSR=OxccZqW*%P0E(nZ^Tg4Of zEh6wd4pwI7#yc2>@U?(C&7<_c`bYDjYo@()LTbS`q{AnUOyyFoJ)-e6PZMfl~6o+CgZlhr1w9YvC^IT7ZR~#%1WoL zLHOeKwz7#wJgoeWGDhFw8a?|lM$dhUKB#D?qK_%st!PNm6N-LW(YT^tQ*>NWN73&n zdPPxbm9hV~{aE_!Kq}KYI7*k7m=%j9&RXD-sgZbQ2+R;I5ojN+c055nw4Ou^TAF4IVhD762hP$`Q!+lL=Yz>==ja< z-o10;5;Y)Ityt;p%2=Al@|PNkEh=}6p;MiPmnYY#bg`ar^tCG0)-J!r?1!%k0UXU8_9dVn)F z{3Kc6w+g$dWqr#PjBUUe0JUA$pbHV!OP$7BwB1CK{i^k%$9VN4ru;HO4bVW8E-li8 zvWm^v4SHDjyBHJA^kw2*TN!)eJ7jxYXTrt&uJ!21Ao3l4G&h^E{XN4GH-f==n!|u{ zd?R2}>t(FilhTaJcKD!lUDd<{6nwpVh4;CbJOh*oFB}ry-mZR++md&A{JiAng;&ZJ z1HeUeK}a4Ffq84TJs&=2&GK`TOUM}3=go;i@C}Qwqy65=e($5@109SJN48qCa=_Vi z4XylKfH9~R(V~!8EKss$19@JV#xV2vS*>#k#AKCvE4Q0^(zA4ZsoLW4Wlgk}mfB?) z#vRX=0v?d)2U_7tYxc@@i^}3N<)0ei$t6-&ssPW!4a+C;TYWcTB&?eAKU-QhbnrChTQQmBsl2lDt_w#wX>vekh5 zw=xANTWxh`veh>Cm|5?%@Vl70!5)rn~b6QhMZpcgeXL^5UwDSYOjvg_X^>l zy;`(pL-{LL=0Vx-P*(MM^WcZSCwxawwv*!X3v+?CmS9_JV8G-=5&ZR>fHoLt6}HnD z?VxOj4s82EXLHOBLY0b8`Bcy_W{d5j&^e>nPAIYCCPyM*79Ot(M8eALtZOELy7v4k z?RG=^xYl0PPAqT11hzr)v!tr9rmFi_sruJX>W1D(stUY_6o9-Rl}#8YZBuJ%yKa@X zKQ^>|j5;LwDUZ)cKI8Fe;W@8JK5gvW3_cOGRb2TI%)JOMeHh@%0&-EP=z#${HHSbS z@eR5Q!ZHl@1%aH%u4&d`R1IIEg4(Hf<8GJ*ZS{E7FoBhEh&+B+^25fw2@E&PI|TFc zCKabN%#Gm;3+d!VA?E_6v!li?vi0S2wVJ1aH#_<*_cNpp};W*s^|Ec4R6?LGf23!!% z>!Edxh(YjiZR*qI%}u7ZTDeCqZ7LPL%QRK~g|<6za`IEUKoF{#^0Q>3300ew%Y(FL zb7UUU)OfhA=`^^gqPb7>n^Hip+-I1tR(A~+L8HU6~ z)xck^gtF*Me1`1TtKE*(gjBYglm7*s3_hhU!x?=UzOYL8uOtjHwlHUI2b+|b7X!sc z)z6T>90Yvk{msk;K7S$eL2!Hg80nGWc@GzW3U-_IcKF?q26+X@_kFV6`e%62Cp$oX z;FB9bp7P0%41d^AbhQjGH3-~g;bqYvZIBh8ya8ktq~ymI=HP|#p6Zj%LVjKa)dcb% zI7Jw5rSc6JXo~-*yRSB@+HBUJzpm9(R2kbR@G=SF4ar1z1qZ;I z+D`axdJ9`mZYDf8wT)p4uT>fpJE>p!SZqHgyrlZI}@4_wiL&AMVpN6FS|EYCP z++nls;XCZ^i4L|m6B%`YX7FomBsS*Q$pbFI4wfEb7#&VJ8Jm97ITNvr+ta~#I-N}0 z88_m_5~DV;lJup<(@tb~HUFbSMpZK9Bvw!9B_2)3)Dmv8X_dZ2>VR9Pe`gOp<~o@k zdyf-M##3o0lX1wc`Z&F@(Vp9?A@yB9!`DRnGmQNlbJTue;B5x}+CX98fPud^aLB;8 zfd>tg20mlp^9H_R;Ix5y)&Ktb@yvKM?e+|hjlrT+I+k!pfW)16JUQ+F8=;*79HdQ8 zBx!`Um0)x%nNcjXX@m@pP=?%gE1`oK#~qBMQiJYeDK!^OCfsy#Y$T;-Bk9p-9T_LY zNsPzRNww18sN=>Xu>^QBm_iQHW9i5Cy&|w4MRWuH7ocwozMH!=z8i4R;12`t#Q!hE Yb0^@}_^SBUUyGke_z3^8{clF#Th+%>hyVZp literal 0 HcmV?d00001 diff --git a/dungeonmap.asm b/dungeonmap.asm index e366532..b4530cc 100644 --- a/dungeonmap.asm +++ b/dungeonmap.asm @@ -20,7 +20,12 @@ DoDungeonMapBossIcon: ; get sprite pointer for room LDA.l UWSpritesPointers,X STA.b Scrap00 ; pointer in $00 - LDA.w #$0028 : STA.b Scrap02 ; set the bank to 28 for now + if !FEATURE_FIX_BASEROM + LDA.w #$0089 + else + LDA.w #$0028 ; set the bank to 28 for now + endif + STA.b Scrap02 LDY.w #$0001 ; to skip the "sort" ; get first byte to make sure it isn't an empty room diff --git a/menu/drsheetdc.2bpp b/menu/drsheetdc.2bpp new file mode 100644 index 0000000000000000000000000000000000000000..11555562c84fb0575be66f61d381b0786b649653 GIT binary patch literal 2048 zcmZ8ie@v8R9DnIrh-1(pCQIWGaKo)X+SIzXOV(wEY_%kB)cix*oXO@ov*L%`-WM2i zY&Fza6VlREs|}n@N^59v=?1M|&K0tz=`m=u=H5fG-OJs>^X>C}o_jsu`?=@6=lgtr zf1Z1Rh@#`2&aoT){~rCjXYykrGRVM3eG_?%HJ;MPg3m-Nqm`ep?(@zV`7;K+)wR8= zx+B!OvsLR?o_MvSwq!?HZHdo_`3#ya+PG|NS*UYtS*u~SJ~St@ay|Dvg_HL@m04T; zUHc1T{^*wP9(01DsHi-!CDI{wN6G_?Kp<$gQLjRMxS%*Ux1hM7xO6k4#;h?-Slj3m zd1U5Van?+{&M@7(7?^*NY%mHv{_MT0>U=V5 z&WIYjTE~`e$MkpdqLqjD?>AmnbMGj-Q3h7>@{K|@cc`9Q~98miMCbQ8?_2HcS`fx9-K{F6= zxpMWz^9IdGgjv#jwoAqdab(6tU7fb@vyIwiBtmqY#?p9CG0{!e(`bWk7!Nmutd-Wf z@Vf8=_U+q-;cW~xdK*jklz!?m+cX7+MQmpud0=P0x)wzulR*nfQ?=2q)hwTwf49LBG;G zd#Yr2X?8wA4)8OL3T`+&9Hx_r1f}vR!FR;c(o(IUHM}5{12n4)d(pw0sB}R$hq+&* z|IpEwY5gl=^wS$@ec_jz&$6n3Z5H#z{QOQo(A#iy?Lw3TQ$kwv!>L<|csy|{H9T+0 zrFsfON7KOgETiN7INdz;lm zJ-GAr@d_XwpAx%)DPS$FMSLVOA_sv>GAR$?Oxim|J?gUk?D^+Ixm01e*-@Gg_vh99a?gIho+p#v)d%G@xi7+Y@S4UoHNUo8LwB5??d-|fI3M$oluvHn7rCkU zSlYkibUOby8NRsRB)S_xm(0J`x0-Ih8NQQpd0t)~=O4l(Nr3N9&!_L3`O)>WIcZlu(1I6U3_y7O^ literal 0 HcmV?d00001 diff --git a/tables.asm b/tables.asm index 596cd38..72012fe 100644 --- a/tables.asm +++ b/tables.asm @@ -790,7 +790,7 @@ HeartContainer_Vitreous: HeartContainer_Trinexx: db $3E ;-------------------------------------------------------------------------------- -; 0x180159 - 0x18015F (unused) [encrypted] +; 0x18015A - 0x18015F (unused) [encrypted] ;================================================================================ org $B08160 ; PC 0x180160 - 0x180162 BonkKey_Desert: