From 139fe4d47fc94116c3b0242f759e9f1ea63d0ca4 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 3 Jun 2021 14:05:26 -0600 Subject: [PATCH] Full clipping of rug on marked rooms --- Rom.py | 2 +- asm/doortables.asm | 31 ++++++++----------------------- asm/overrides.asm | 8 ++++---- data/base2current.bps | Bin 133179 -> 133119 bytes 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/Rom.py b/Rom.py index 64745298..9b06ec57 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'fef56e6629ee9fe1de52b7842beb333d' +RANDOMIZERBASEHASH = '47e937d11855bc775587fe2a7acfa3a3' class JsonRom(object): diff --git a/asm/doortables.asm b/asm/doortables.asm index e427fd48..db1b6711 100644 --- a/asm/doortables.asm +++ b/asm/doortables.asm @@ -574,29 +574,14 @@ dw $0058, $0148, $0198, $0190 org $27E000 CutoffRooms: -; Room, quad, y max, x max, x min -dw $00bc, $0007, $0009, $0003 ; TT Alcove -dw $00a2, $0007, $000b, $0000 ; Mire Bridge Left & Right -dw $00a3, $0009, $0008, $0004 ; Mire Bent Bridge -dw $00c2, $0007, $0008, $0000 ; Mire Hub -;dw $00c2, $0004, $0008, $0004 ; Mire Hub -dw $001a, $0007, $0008, $0004 ; Pod Falling & Harmless -dw $0049, $0004, $0008, $0004 ; SW Star Pits -dw $0014, $0009, $0008, $0004 ; TR Lava Escape & TR Dual Pipes -dw $008c, $0009, $0008, $0004 ; Bob's Room & GT Big Chest - -dw $009f, $0009, $000a, $0002 ; Ice Many Pots -dw $0066, $0009, $0008, $0000 ; Swamp Waterfall -dw $005d, $0007, $000b, $0000 ; GT Gauntlet 3 -dw $00a8, $0007, $0008, $0004 ; Eastern Push Block -dw $00a9, $0009, $0009, $0003 ; Eastern Courtyard -dw $00aa, $0009, $0009, $0003 ; Eastern Map Valley -dw $00b9, $0008, $000b, $0000 ; Eastern Cannonball -dw $0052, $0008, $000a, $0003 ; HC East Hall - affects both doors - -dw $0050, $0009, $000a, $0002 ; HC West Hall -dw $00c5, $0008, $0008, $0000 ; TR Dash Bridge -dw $00c6, $0007, $0008, $0004 ; TR Hub +; TT Alcove, Mire Bridge Left & Right, Mire Bent Bridge, Mire Hub +; Pod Falling & Harmless, SW Star Pits, TR Lava Escape & TR Dual Pipes, Bob's Room & GT Big Chest +dw $00bc, $00a2, $00a3, $00c2, $001a, $0049, $0014, $008c +; Ice Many Pots, Swamp Waterfall, GT Gauntlet 3, Eastern Push Block, Eastern Courtyard, Eastern Map Valley +; Eastern Cannonball, HC East Hall +dw $009f, $0066, $005d, $00a8, $00a9, $00aa, $00b9, $0052 +; HC West Hall, TR Dash Bridge, TR Hub, Pod Arena, GT Petting Zoo +dw $0050, $00c5, $00c6, $0009, $0003, $002a, $007d dw $ffff ; dungeon tables diff --git a/asm/overrides.asm b/asm/overrides.asm index 40d48e5c..f9842866 100644 --- a/asm/overrides.asm +++ b/asm/overrides.asm @@ -93,13 +93,13 @@ CutoffEntranceRug: cmp #$000C : BNE .norm + LDX #$0000 : LDA !CutoffTable, x - CMP.W $A0 : BEQ .check - TXA : !ADD #$0008 : TAX : LDA !CutoffTable, x : CMP.w #$FFFF : BNE - + INX #2 : LDA !CutoffTable, x : CMP.w #$FFFF : BNE - .norm PLX : PLA : LDA $9B52, y : STA $7E2000, x ; what we wrote over RTL .check - LDA $0c : CMP.l !CutoffTable+2, x : !BGE .skip - LDA $0e : CMP.l !CutoffTable+4, x : !BGE .skip - CMP.l !CutoffTable+6, x : !BLT .skip + LDA $0c : CMP #$0004 : !BGE .skip + LDA $0e : CMP #$0008 : !BGE .skip + CMP.l #$0004 : !BLT .skip BRA .norm .skip PLX : PLA : RTL diff --git a/data/base2current.bps b/data/base2current.bps index 7d08f3676288ec72e609ef9a010805d031647f73..cf03abefe0079ba3423365dc823669ba215f3e10 100644 GIT binary patch delta 1180 zcmW-bdrVVj7{=f4oc8nxm5YL+csanNmP9O0rkfER!^O*Fb(!KcNJZvMx-FZRIE{m^ z*rPT~dg!-uET95<7FuP+oo!VF@e(H8G%J6&nJrtr%&3vT$A+@F=vncf_x(Lj-uKCK zUg9-3-;s~T-3v~&?(FksUR4WF6N8NE@9g(1Y9b!PDfG2kz}F&lUcEkU4MK(L%=m~7 z<*GEXJqP8h$6ot*7rLa5@7OyRZ6t@HCcdN&>lGw;NGLi39VEX*Gq|WkoQ`z$Sv137 zj7nmre+0+JPSVw!`*YZ;PjQ&DS6C}H1sQCjOvMWO^50%ymZA&C0o8|%5SiQx&;z$j z*PDT+K6o&OVNHwBr`sCmM#Xzg;BrCEGdGpUNSEQ zp;aQ&up`r5?GQ+HtuYyUKAVGmHnWBn-UE5d+1i(f>UE2~!?ZV6vrPdZgNTe`h=~{l z6umhS+Rio3KX;T7mJtyYqr7(7s8463tRIk^UH+tB)ZMYzy2*xtq(xIZ9lX1`U9aeb zsPv%Q*DJ=8R?%qll>A9Hclu&F&eoklk~(W{ISg)R&E1+GV-F4PyJ9*~2C`5I2@jZ% zM;#tWKzTa|PPwReXJgl1f<650_LZ@E_z&Af06N<(JF?{J!!p5BD3fsvmL++Hyda}=<7$CyFRax&(o*gWTZy+~^W(ZHdG^JHd@S56sY}Di{n$*|l zfBaHxpIDGjTX}U zN`9s@P$wCr#b`QNJZxH2vDxKf=)49YzoR{34pPn3+f0*!f0IJDiw};t5BMX=cP#$N zV(H*5MxMeoikB@VP3zcd8L7VE#rjQoxC>h01YCxxumV!x3pfs2p%mJ{4*@s_?|>D0 z;RhH8EabrFa}VT9^rnv{zwIF7D@Iy4j?;69<#>7Go(6?M9Lq8Y>2&hC_`tEUf}`rL z(UpmEiUFm`OIegGTRCJHqok0|fZB2mdp3p~MOW8{)O;kR&SZC7sNFdo_d|fQ?A!kw zegzG7m-pO2=-s}9@~TkzDzpZpkK}KELS0!_xpadGuf|nc;PMjCG;K&5n^-H;@LJFU yL!imhHI&UJ6xW72uc3$Y666i#59?0BX=uOl`Uej~K@B;1{>+n4-d`B+?fM^6Qu=EE delta 1258 zcmW-bYfKbZ7>3W8z0JZZP;X#B1{6m~K%kO})+(Pktki zT{+Oa^laby{R553KPrpi2?9ndcXa1)n*JpEK39bpyWYIBXkRfHqp1=%Phkp(v8HWX2%_b@@0!b#zu)rm| zo}x(YBvDCwkgltM$Y-?fDA=*hO(0q&cH~=E|Mm)LS?`Mgs=;TmPgyqN>;psejTWHB z*{2PgMM&vCJzahgICwY~yj~c|pS` z0`&;n8f6{VQf<7t??SIW75UAwo`Y0&6`COHn~5Wh)I5QDS=}6cR*A&Dj}j_kFWkx# zWF58jFhgw+WQuxMNL>o3(*ll1Y%*WTQn<3g5`%1?q$3BD8iMox1fumq!|Or2eo^CN z)tedu?J}TJFh|HHt!UIC8&ab{dyn*H&zA(1k2xS)#Nzldhn`V&E&#>Z+yA}E>F;MU zz4)Dx=!MA_S(2~pG{|~tSoo{g;pHN6D`#PBTLo9 z22K1hmxxb|%!EaFV1$NtMID(4vkqZ2x!=IgMz!S_*~ojHYqam7yG%a->KtBVXNr~e z5=L=ijiU>rDC#htJGwUY1{M=C>RcpHt?rpm%c&l5YybNLp7_8`W24-?BugH&Qity}CT2 zzfsCXF2C-rb+}2L2cP1f)EV$H9#z-F6ujs$owNJB+FC+QYocsHFQz zIQ=pAGhNfT;?W^OTy>y{yOR0Ai7mQH(X2E-USz27T>>Ux20GBHWh4Ng4VcBWy*0Mo zr7bQ!n66n8=s~_z7Il=JEH$%7CEnSrEg}E`cH(oj02E7i*mkMa>C$ZYr4H!{+aoR{ zSs855#%ArXKw?ZR>upN<=p_4{)SCEQmmuIG!viOtK9-=%d!t!dFt#QtjW0YKEWHzq zbMg7-g3Rw>Sf&Kuz8i+zuY(1HVaVzZt`3MdjWFKhHNvklOdl6{*cI0bJo|E>FeUNx zy_XyIC!m|4!Cds_2 L?(N&`ZEgPpT$(2$