From 865a8b52ce78e4e4bd09b0e6338b8cf8757f4d77 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Sun, 12 Nov 2023 14:35:16 +0100 Subject: [PATCH] Fix a little fuck up in score sorting. --- bin/DMGTRIS.GBC | Bin 131072 -> 131072 bytes bin/DMGTRIS.map | 310 ++++++++++++++++++++++----------------------- bin/DMGTRIS.pocket | Bin 131072 -> 131072 bytes bin/DMGTRIS.sym | 260 ++++++++++++++++++------------------- src/hiscore.asm | 2 + 5 files changed, 287 insertions(+), 285 deletions(-) diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index c9e48a06fc8634e7c3ca41d4b60e7355463b2c43..7301e3f258b29503fde4428dd5a800886ef271b0 100644 GIT binary patch delta 3241 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 diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map index b0f02ab..6f07c82 100644 --- a/bin/DMGTRIS.map +++ b/bin/DMGTRIS.map @@ -428,164 +428,164 @@ ROM0 bank #0: $3174 = Next7Piece $3174 = !20 $317e = NextByte - SECTION: $319e-$3361 ($01c4 bytes) ["Hi Score Functions"] + SECTION: $319e-$3365 ($01c8 bytes) ["Hi Score Functions"] $319e = CheckAndAddHiscore $31a8 = CheckAndAddHiscore.checkloop $31ad = CheckAndAddHiscore.checkgrade $31b6 = CheckAndAddHiscore.oldgraded - $31c1 = CheckAndAddHiscore.oldungraded - $31c8 = CheckAndAddHiscore.checklevel - $31ed = CheckAndAddHiscore.checkscore - $3230 = CheckAndAddHiscore.notbetter - $323d = CheckAndAddHiscore.better - $323f = InsertHiScore - $323f = InsertHiScore.copylower - $3250 = InsertHiScore.copyupper - $325d = !0 - $3271 = InsertHiScore.findrow - $327e = !1 - $3282 = InsertHiScore.insert - $32db = InsertHiScore.persist - $32ec = GetHiScoreEntry - $3301 = !2 - $3305 = GetHiScoreEntry.store - $330e = InitTargetHSTable - $3319 = InitTargetHSTable.jumps - $332e = InitTargetHSTable.dmgt - $3333 = InitTargetHSTable.tgm1 - $3338 = InitTargetHSTable.tgm3 - $333d = InitTargetHSTable.deat - $3342 = InitTargetHSTable.shir - $3347 = InitTargetHSTable.chil - $334c = InitTargetHSTable.myco - $334f = InitTargetHSTable.store - SECTION: $3362-$34ab ($014a bytes) ["Progress Data"] - $3362 = sProgressData - SECTION: $34ac-$35eb ($0140 bytes) ["Hi Score Data"] - $34ac = sHiscoreDefaultData - SECTION: $35ec-$371f ($0134 bytes) ["Input Functions"] - $35ec = InputInit - $35fe = GetInput - $35fe = GetInput.btns - $360b = GetInput.readA - $360f = GetInput.setA - $361a = GetInput.clearA - $361d = GetInput.readB - $3621 = GetInput.setB - $362c = GetInput.clearB - $362f = GetInput.readSelect - $3633 = GetInput.setSelect - $363e = GetInput.clearSelect - $3641 = GetInput.readStart - $3645 = GetInput.setStart - $3650 = GetInput.clearStart - $3653 = GetInput.dpad - $3660 = GetInput.readUp - $3664 = GetInput.setUp - $366f = GetInput.clearUp - $3672 = GetInput.readDown - $3676 = GetInput.setDown - $3681 = GetInput.clearDown - $3684 = GetInput.readLeft - $3688 = GetInput.setLeft - $3693 = GetInput.clearLeft - $3696 = GetInput.readRight - $369a = GetInput.setRight - $36a5 = GetInput.clearRight - $36a8 = GetInput.priorities - $36b5 = GetInput.jumps - $36c4 = GetInput.dlru - $36d7 = GetInput.ulrd - $36ea = GetInput.lrud - $36f7 = GetInput.udlr - $3704 = GetInput.zeroud - $370a = GetInput.zerolr - $3710 = GetInput.zerolrd - $3718 = GetInput.zerolru - SECTION: $3720-$37ff ($00e0 bytes) ["Score Functions"] - $3720 = ScoreInit - $3748 = IncreaseScore - $3780 = IncreaseScore.doConvert - $3782 = !0 - $3798 = IncreaseScore.carry - $379a = IncreaseScore.postConvert - $37a7 = !1 - $37ae = IncreaseScore.preAddDigit - $37d6 = IncreaseScore.addDigit - $37ec = IncreaseScore.nextDigit - SECTION: $3800-$38ca ($00cb bytes) ["Title Function Trampolines"] - $3800 = SwitchToTitle - $3809 = TitleEventLoopHandler - $3813 = TitleVBlankHandler - $381d = PersistLevel - $382b = DrawSpeedMain - $387b = DrawSpeedSettings - SECTION: $38cb-$3990 ($00c6 bytes) ["Time Functions"] - $38cb = TimeInit - $38eb = StartCountdown - $38f9 = ResetGameTime - $3904 = CheckTorikan - $391b = CheckTorikan.failure - $391d = CheckTorikan.success - $3920 = HandleTimers - $3946 = HandleTimers.reduce - $3953 = HandleTimers.clock - $396d = HandleTimers.go - SECTION: $3991-$3a42 ($00b2 bytes) ["Progress Functions"] - $3991 = SetProgress - $399c = SetProgress.loop - $39a0 = SetProgress.correct - $39c7 = SetProgress.wvr_u1 - $39d3 = SetProgress.wvr_u2 - $39e1 = SetProgress.wvr_u3 - $39ed = SetProgress.wvr_u4 - $39fb = SetProgress.wvr_u5 - $3a07 = SetProgress.wvr_u6 - $3a15 = SetProgress.wvr_u7 - $3a21 = SetProgress.wvr_u8 - $3a2f = SetProgress.wvr_u9 - $3a3b = SetProgress.wvr_u10 - SECTION: $3a43-$3ad4 ($0092 bytes) ["Code Entry Point"] - $3a43 = Main - $3a6c = Main.notgbc - $3a72 = Main.wvr_u1 - $3a99 = EventLoop - $3aaf = EventLoop.eventloopjumps - $3ab8 = EventLoopPostHandler - $3aba = EventLoopPostHandler.wvb_u2 - $3acc = EventLoopPostHandler.vblankjumps - SECTION: $3ad5-$3b26 ($0052 bytes) ["Tile Functions"] - $3ad5 = LoadTitleTiles - $3af3 = LoadGameplayTiles - $3b09 = LoadGameplayTiles.gbc - $3b18 = LoadGameplayTiles.dmg - SECTION: $3b27-$3b62 ($003c bytes) ["Time Data"] - $3b27 = sFramesToCS - SECTION: $3b63-$3b90 ($002e bytes) ["Memory Functions"] - $3b63 = UnsafeMemCopy - $3b6c = SafeMemCopy.wvr_u1 - $3b6c = SafeMemCopy - $3b7b = UnsafeMemSet - $3b83 = SafeMemSet - $3b83 = SafeMemSet.wvr_u2 - SECTION: $3b91-$3bb6 ($0026 bytes) ["Gameplay Function Trampolines"] - $3b91 = SwitchToGameplay - $3b9a = SwitchToGameplayBig - $3ba3 = GamePlayEventLoopHandler - $3bad = GamePlayBigEventLoopHandler - SECTION: $3bb7-$3bdb ($0025 bytes) ["Interrupt Initialization Functions"] - $3bb7 = EnableScreenSquish - $3bd1 = DisableScreenSquish - SECTION: $3bdc-$3bfd ($0022 bytes) ["OAM Functions"] - $3bdc = CopyOAMHandler - $3be8 = ClearOAM - SECTION: $3bfe-$3c0c ($000f bytes) ["Banking Functions"] - $3bfe = BankingInit - SECTION: $3c0d-$3c16 ($000a bytes) ["OAM DMA Code"] - $3c0d = OAMDMA - $3c17 = OAMDMAEnd - EMPTY: $3c17-$3fff ($03e9 bytes) - TOTAL EMPTY: $03f4 bytes + $31c5 = CheckAndAddHiscore.oldungraded + $31cc = CheckAndAddHiscore.checklevel + $31f1 = CheckAndAddHiscore.checkscore + $3234 = CheckAndAddHiscore.notbetter + $3241 = CheckAndAddHiscore.better + $3243 = InsertHiScore + $3243 = InsertHiScore.copylower + $3254 = InsertHiScore.copyupper + $3261 = !0 + $3275 = InsertHiScore.findrow + $3282 = !1 + $3286 = InsertHiScore.insert + $32df = InsertHiScore.persist + $32f0 = GetHiScoreEntry + $3305 = !2 + $3309 = GetHiScoreEntry.store + $3312 = InitTargetHSTable + $331d = InitTargetHSTable.jumps + $3332 = InitTargetHSTable.dmgt + $3337 = InitTargetHSTable.tgm1 + $333c = InitTargetHSTable.tgm3 + $3341 = InitTargetHSTable.deat + $3346 = InitTargetHSTable.shir + $334b = InitTargetHSTable.chil + $3350 = InitTargetHSTable.myco + $3353 = InitTargetHSTable.store + SECTION: $3366-$34af ($014a bytes) ["Progress Data"] + $3366 = sProgressData + SECTION: $34b0-$35ef ($0140 bytes) ["Hi Score Data"] + $34b0 = sHiscoreDefaultData + SECTION: $35f0-$3723 ($0134 bytes) ["Input Functions"] + $35f0 = InputInit + $3602 = GetInput + $3602 = GetInput.btns + $360f = GetInput.readA + $3613 = GetInput.setA + $361e = GetInput.clearA + $3621 = GetInput.readB + $3625 = GetInput.setB + $3630 = GetInput.clearB + $3633 = GetInput.readSelect + $3637 = GetInput.setSelect + $3642 = GetInput.clearSelect + $3645 = GetInput.readStart + $3649 = GetInput.setStart + $3654 = GetInput.clearStart + $3657 = GetInput.dpad + $3664 = GetInput.readUp + $3668 = GetInput.setUp + $3673 = GetInput.clearUp + $3676 = GetInput.readDown + $367a = GetInput.setDown + $3685 = GetInput.clearDown + $3688 = GetInput.readLeft + $368c = GetInput.setLeft + $3697 = GetInput.clearLeft + $369a = GetInput.readRight + $369e = GetInput.setRight + $36a9 = GetInput.clearRight + $36ac = GetInput.priorities + $36b9 = GetInput.jumps + $36c8 = GetInput.dlru + $36db = GetInput.ulrd + $36ee = GetInput.lrud + $36fb = GetInput.udlr + $3708 = GetInput.zeroud + $370e = GetInput.zerolr + $3714 = GetInput.zerolrd + $371c = GetInput.zerolru + SECTION: $3724-$3803 ($00e0 bytes) ["Score Functions"] + $3724 = ScoreInit + $374c = IncreaseScore + $3784 = IncreaseScore.doConvert + $3786 = !0 + $379c = IncreaseScore.carry + $379e = IncreaseScore.postConvert + $37ab = !1 + $37b2 = IncreaseScore.preAddDigit + $37da = IncreaseScore.addDigit + $37f0 = IncreaseScore.nextDigit + SECTION: $3804-$38ce ($00cb bytes) ["Title Function Trampolines"] + $3804 = SwitchToTitle + $380d = TitleEventLoopHandler + $3817 = TitleVBlankHandler + $3821 = PersistLevel + $382f = DrawSpeedMain + $387f = DrawSpeedSettings + SECTION: $38cf-$3994 ($00c6 bytes) ["Time Functions"] + $38cf = TimeInit + $38ef = StartCountdown + $38fd = ResetGameTime + $3908 = CheckTorikan + $391f = CheckTorikan.failure + $3921 = CheckTorikan.success + $3924 = HandleTimers + $394a = HandleTimers.reduce + $3957 = HandleTimers.clock + $3971 = HandleTimers.go + SECTION: $3995-$3a46 ($00b2 bytes) ["Progress Functions"] + $3995 = SetProgress + $39a0 = SetProgress.loop + $39a4 = SetProgress.correct + $39cb = SetProgress.wvr_u1 + $39d7 = SetProgress.wvr_u2 + $39e5 = SetProgress.wvr_u3 + $39f1 = SetProgress.wvr_u4 + $39ff = SetProgress.wvr_u5 + $3a0b = SetProgress.wvr_u6 + $3a19 = SetProgress.wvr_u7 + $3a25 = SetProgress.wvr_u8 + $3a33 = SetProgress.wvr_u9 + $3a3f = SetProgress.wvr_u10 + SECTION: $3a47-$3ad8 ($0092 bytes) ["Code Entry Point"] + $3a47 = Main + $3a70 = Main.notgbc + $3a76 = Main.wvr_u1 + $3a9d = EventLoop + $3ab3 = EventLoop.eventloopjumps + $3abc = EventLoopPostHandler + $3abe = EventLoopPostHandler.wvb_u2 + $3ad0 = EventLoopPostHandler.vblankjumps + SECTION: $3ad9-$3b2a ($0052 bytes) ["Tile Functions"] + $3ad9 = LoadTitleTiles + $3af7 = LoadGameplayTiles + $3b0d = LoadGameplayTiles.gbc + $3b1c = LoadGameplayTiles.dmg + SECTION: $3b2b-$3b66 ($003c bytes) ["Time Data"] + $3b2b = sFramesToCS + SECTION: $3b67-$3b94 ($002e bytes) ["Memory Functions"] + $3b67 = UnsafeMemCopy + $3b70 = SafeMemCopy.wvr_u1 + $3b70 = SafeMemCopy + $3b7f = UnsafeMemSet + $3b87 = SafeMemSet + $3b87 = SafeMemSet.wvr_u2 + SECTION: $3b95-$3bba ($0026 bytes) ["Gameplay Function Trampolines"] + $3b95 = SwitchToGameplay + $3b9e = SwitchToGameplayBig + $3ba7 = GamePlayEventLoopHandler + $3bb1 = GamePlayBigEventLoopHandler + SECTION: $3bbb-$3bdf ($0025 bytes) ["Interrupt Initialization Functions"] + $3bbb = EnableScreenSquish + $3bd5 = DisableScreenSquish + SECTION: $3be0-$3c01 ($0022 bytes) ["OAM Functions"] + $3be0 = CopyOAMHandler + $3bec = ClearOAM + SECTION: $3c02-$3c10 ($000f bytes) ["Banking Functions"] + $3c02 = BankingInit + SECTION: $3c11-$3c1a ($000a bytes) ["OAM DMA Code"] + $3c11 = OAMDMA + $3c1b = OAMDMAEnd + EMPTY: $3c1b-$3fff ($03e5 bytes) + TOTAL EMPTY: $03f0 bytes ROMX bank #1: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"] @@ -3290,7 +3290,7 @@ HRAM bank #0: TOTAL EMPTY: $0002 bytes SUMMARY: - ROM0: 15372 bytes used / 1012 free + ROM0: 15376 bytes used / 1008 free ROMX: 68697 bytes used / 29607 free in 6 banks SRAM: 2951 bytes used / 5241 free in 1 bank WRAM0: 3909 bytes used / 187 free diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 08aaf49a62b12757b7f6bcfced7a21261a10c82c..4bbabf413e49856715d80ddd250dae1303e12068 100644 GIT binary patch delta 3241 zcmb`Je{56N702K4?-!OIFA(Pu65>mKLJ1!6Y78&25(;q%tfp#U3Kg`3Cf>SkOEr!C z>gvE48I#Zg23}gVC`2h)t4e9HRJSXgqPM(y`CoAxN zA+a{vLPp-kRoGVByj%Y*B*`DR#uD%clB^Zm#cb25Zsif|F8IC?o)3nLKhxvmt)=SY zLiwx??g^f)=rs6!0vR0P%p=goP~<5Mo6qI#9t{s_cuK?OQBAyt2lMRK$BvD-4YA0G z+ZbcdxlI9I^^d);d;{7*!qv@VT#h|2gi z?T_kqVLM%SxWuwCnX;8clBJU-Ly?PGf_v-tv4uW?Yw9Dj?}8as5)9j~LS?CAB6jp$ z8gK5}3riUG>13+0*pn!T;`3nO_v=rAFW_yqVcXyQGi+y@*YH&i_J-8#kTy7^7KhaC zkUAXFc89bx*yK2(FMh*`-mp{pz$x8wN_PU2&ha%zHUK|Qv3)LuZPDl0+>bxL!kubi zUGwk!<0p2{Pwig)wdVpSHViDexXEOQ(%9xX>G@!#>mWd1Ah7X<|E55HzJkgEeYA>3 zT{M0#rE96KWkS9}4KC`m(4^!m5 zoU_~|MT(_AEHy!t^K2u`05E#mFL0h6g!v^fg~(DPll3-c+-iN>iaAf8Hj49fXS;zK z;nzwIrYJqOdrrC-cui=qaV_M-6cjK@eK1M9W30+8Lzu9NSmFypN`Ik^pDehtX+pk_ z{z;%WPp^UlsJ_HK(d05)1@}}p=^X~6QsCU7Zt|-P^9Ph2r7)mF6R=$qusOYDA+aVp z?ZLR6-Q=-heA~)I4|kIz8RjdvK8@!|)w5X*;~Dxxa37N&h;XYOQ*OQy9S+XfKHm55 zwm;(Wq~pX6fNJoC`T%Nm4xeCR5_Qq(hUo?`8SQ4f_L7gE0fVv`bkt`Y7gWcMv_pJL z4?Ot9-x;B*cJ;IAVE$`dtea$e+`1@%VbCknNcK><0k#5;*lPs7;!7r;7*;0{e~bR~ z#5MQfRijQhm-Z>Usmbi-sJa_(&JmwWZ~vBRw`aCb{bG>`R#f&2M1BTJ7?clTp3Q(w z0jXcyY66epv>=@g4Vj=xznZwDU7hjsKZuX}ppapIA)kLr9;d1`(GaC8JJS}4h<|6{ zC=l^`1$dZ5JYE2g6!t4$6WdbI>jSwhvN@VYUybvgW{-j4!1dkLNZYf91D z;Y(1-sOUDuR?=8CjgZkW#2M=o5`M-;!{lTHdx}Cw!(5i#sTiT8eFm;ER^@}38KSBe zM;mdpVtqM}uVoRS5oX?{vl3T7Mj}>{W&7s>Q--(Frhrk`` zZig)_>D^_>GL0Ax{&p@5{ zW*4wd)NgAKU2w&(w%UxC#+3>AD)(6rSr@^5D(Y_SakF^kx!dT9_V|19`}CXZ=|U*c z1zsq}KPP4K6{&JRwX|{d2M8WC{+scI9^DOpD*$yhUfj1Iiu?vwd^X867RPU5%f@eE ztC!IDX%cM3bXQya17+nKatznwl0C{>Z&a377~f=$@lE9z-$af#YxwaD^ABTE@>N@x zi4kY_Ln&5XazC`fT&Sf7KB`jWs?ph9Dfez*j zuPDDz+aWlrsCVi&(4sRa>J@Frp$z(UNn@5x5z>_9k_c(eaz%t}$Z~Cjv}8C@FhklyjsVQ* z(xq_tyZ>V;REqs)U{AUp)|pZ4WxaIaj0okt%Bt|Uwb6Es@a-b($O-@b1B&pIz2uRZ zwD3<3!;?$0!mk_yr3f0vp#Hz;|K9ez{>yr~KlduaOluqYI~qQr;Wsq=k%n0c%hb{> f>rEFxr%9X{gQci{c?=vdC!+qp9@_E(T-@_7WW%cK delta 3254 zcmb`Jdu$Zf6^G~S(_`0U>%}5v@2n_X# zHh@v>X@yBZn`3;0xde=fdi;CLzca2)kFcsE(7T|AI1%Xz#aDzA+@uXVXv4hHPFCc- zVtiG&m5g4(RamF+z-4>_N%2ZISOQ)t!P>B0$bvx&s}Fxq{#VU#${#HL(1?$>O0~y@ z@>v5k_|H^yng%=~86M@VqtM1suO#kVZhR5RWh&hhoVW*Nq>5Nax#9Hjrp>8^ zruA&<@Y7NELUVYbIknKVjx8LkH(6XbW%~o91>l%;w`K{L{CTzW04B*$w+h>)x-Hm# zvu+o*({+bSOdAqOp(K=8G-)vvIjG6Mw|*a6=n=Wq2g&Reu%b%*!KUlL7uhGGLs#gX z=I*^vz_2eRl8puKcz#%Vd+muDj~E}il3*Gu2*ad>yZP~W4c#BFrB9H0NkMTxd3A4`{7&f5mp z1OI?x`@uOx4{J#b5;-lg=0 zNS~^r(++xP9i^*i0*mh&WgN7ni54``#5yW$AQKy7_bp5pF3mcWABoCOM9WBQ^F`r4 zeK$#FvcXb^5-L{SF10|Ib8jciATUPSFLLf3g!wKog~&=HlZiH_!&;#W#hm+~z8B~2 z$(T}u_==i?B}|X(o>MMLzY-gS!dCKb67m_fP?!W>Ha7LTAxuz1taWHj8l^{DO&8ku z$^1WVoQQ0qe-P=dS8Kq7Qj9+mPAnEGxEFg!pAXDxwR4Ah$oJCBd(>SevBOqfhsSgs zI#Syf<153{ZtSsSrZ&BsA#FEZ*+6VAwf(!AzbUXnNuu(YyYB#~24 z!k~l*b2<%z3QE7c#R6{AF;O`k7_q==lZlFstOF`LMsRU;V_;B0HYpIbYysC2%4yP`wB)ngd&wz+dVI zP-JH=LqFJ(s@@J?hDt_5mnFK4MyqLvj0GXa*!mUxri}&3@eo?7O2>j+hF!@hp`?8V zZZJ0W>zE#*DHunaakT1vGl##(;DAUbGc1zJIlP*~n>oCd!+SY=kV8u-yIe^QD{{Cz zi!Mv#en@UV1g=0&J8WiQTi{G5>@n`}im{PIQcLxtB#5qD&pYb3Iro@k=z?Av5msK}061Yb(Ao>{RjG2->FlAD`!F(mSQUOgrR4vk4CN07 zp}ZB-`j5G|jHuO5DZfD5AsABCJN12NHJDWO%ED171Fu|l6nNEfTy-qQUq)4qeP;Y% zaF>ImcqaX&xEdsjGkh~hmSp%=kSxpay&$R0@Pi;}%&;XyR%f^*M4B^P5hCj|ygWo& z(;UyAA?*RX1apQ|DIEUt|5yr@@^dF)PpTf)SW)a{eRTe$4CTDWn(()`(RQ8in`GFL z75+OORrrZMvVSHe{Np}&z91v~%5hMOpkW;9|BL?DwdeF-*2n#+PZefL+sI$i@i86$ qQpfMi^Ne=GWjid;SHjU8}(W diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym index aafd9f0..529d0b9 100644 --- a/bin/DMGTRIS.sym +++ b/bin/DMGTRIS.sym @@ -334,136 +334,136 @@ 00:31a8 CheckAndAddHiscore.checkloop 00:31ad CheckAndAddHiscore.checkgrade 00:31b6 CheckAndAddHiscore.oldgraded -00:31c1 CheckAndAddHiscore.oldungraded -00:31c8 CheckAndAddHiscore.checklevel -00:31ed CheckAndAddHiscore.checkscore -00:3230 CheckAndAddHiscore.notbetter -00:323d CheckAndAddHiscore.better -00:323f InsertHiScore -00:323f InsertHiScore.copylower -00:3250 InsertHiScore.copyupper -00:3271 InsertHiScore.findrow -00:3282 InsertHiScore.insert -00:32db InsertHiScore.persist -00:32ec GetHiScoreEntry -00:3305 GetHiScoreEntry.store -00:330e InitTargetHSTable -00:3319 InitTargetHSTable.jumps -00:332e InitTargetHSTable.dmgt -00:3333 InitTargetHSTable.tgm1 -00:3338 InitTargetHSTable.tgm3 -00:333d InitTargetHSTable.deat -00:3342 InitTargetHSTable.shir -00:3347 InitTargetHSTable.chil -00:334c InitTargetHSTable.myco -00:334f InitTargetHSTable.store -00:3362 sProgressData -00:34ac sHiscoreDefaultData -00:35ec InputInit -00:35fe GetInput -00:35fe GetInput.btns -00:360b GetInput.readA -00:360f GetInput.setA -00:361a GetInput.clearA -00:361d GetInput.readB -00:3621 GetInput.setB -00:362c GetInput.clearB -00:362f GetInput.readSelect -00:3633 GetInput.setSelect -00:363e GetInput.clearSelect -00:3641 GetInput.readStart -00:3645 GetInput.setStart -00:3650 GetInput.clearStart -00:3653 GetInput.dpad -00:3660 GetInput.readUp -00:3664 GetInput.setUp -00:366f GetInput.clearUp -00:3672 GetInput.readDown -00:3676 GetInput.setDown -00:3681 GetInput.clearDown -00:3684 GetInput.readLeft -00:3688 GetInput.setLeft -00:3693 GetInput.clearLeft -00:3696 GetInput.readRight -00:369a GetInput.setRight -00:36a5 GetInput.clearRight -00:36a8 GetInput.priorities -00:36b5 GetInput.jumps -00:36c4 GetInput.dlru -00:36d7 GetInput.ulrd -00:36ea GetInput.lrud -00:36f7 GetInput.udlr -00:3704 GetInput.zeroud -00:370a GetInput.zerolr -00:3710 GetInput.zerolrd -00:3718 GetInput.zerolru -00:3720 ScoreInit -00:3748 IncreaseScore -00:3780 IncreaseScore.doConvert -00:3798 IncreaseScore.carry -00:379a IncreaseScore.postConvert -00:37ae IncreaseScore.preAddDigit -00:37d6 IncreaseScore.addDigit -00:37ec IncreaseScore.nextDigit -00:3800 SwitchToTitle -00:3809 TitleEventLoopHandler -00:3813 TitleVBlankHandler -00:381d PersistLevel -00:382b DrawSpeedMain -00:387b DrawSpeedSettings -00:38cb TimeInit -00:38eb StartCountdown -00:38f9 ResetGameTime -00:3904 CheckTorikan -00:391b CheckTorikan.failure -00:391d CheckTorikan.success -00:3920 HandleTimers -00:3946 HandleTimers.reduce -00:3953 HandleTimers.clock -00:396d HandleTimers.go -00:3991 SetProgress -00:399c SetProgress.loop -00:39a0 SetProgress.correct -00:39c7 SetProgress.wvr_u1 -00:39d3 SetProgress.wvr_u2 -00:39e1 SetProgress.wvr_u3 -00:39ed SetProgress.wvr_u4 -00:39fb SetProgress.wvr_u5 -00:3a07 SetProgress.wvr_u6 -00:3a15 SetProgress.wvr_u7 -00:3a21 SetProgress.wvr_u8 -00:3a2f SetProgress.wvr_u9 -00:3a3b SetProgress.wvr_u10 -00:3a43 Main -00:3a6c Main.notgbc -00:3a72 Main.wvr_u1 -00:3a99 EventLoop -00:3aaf EventLoop.eventloopjumps -00:3ab8 EventLoopPostHandler -00:3aba EventLoopPostHandler.wvb_u2 -00:3acc EventLoopPostHandler.vblankjumps -00:3ad5 LoadTitleTiles -00:3af3 LoadGameplayTiles -00:3b09 LoadGameplayTiles.gbc -00:3b18 LoadGameplayTiles.dmg -00:3b27 sFramesToCS -00:3b63 UnsafeMemCopy -00:3b6c SafeMemCopy.wvr_u1 -00:3b6c SafeMemCopy -00:3b7b UnsafeMemSet -00:3b83 SafeMemSet -00:3b83 SafeMemSet.wvr_u2 -00:3b91 SwitchToGameplay -00:3b9a SwitchToGameplayBig -00:3ba3 GamePlayEventLoopHandler -00:3bad GamePlayBigEventLoopHandler -00:3bb7 EnableScreenSquish -00:3bd1 DisableScreenSquish -00:3bdc CopyOAMHandler -00:3be8 ClearOAM -00:3bfe BankingInit -00:3c0d OAMDMA -00:3c17 OAMDMAEnd +00:31c5 CheckAndAddHiscore.oldungraded +00:31cc CheckAndAddHiscore.checklevel +00:31f1 CheckAndAddHiscore.checkscore +00:3234 CheckAndAddHiscore.notbetter +00:3241 CheckAndAddHiscore.better +00:3243 InsertHiScore +00:3243 InsertHiScore.copylower +00:3254 InsertHiScore.copyupper +00:3275 InsertHiScore.findrow +00:3286 InsertHiScore.insert +00:32df InsertHiScore.persist +00:32f0 GetHiScoreEntry +00:3309 GetHiScoreEntry.store +00:3312 InitTargetHSTable +00:331d InitTargetHSTable.jumps +00:3332 InitTargetHSTable.dmgt +00:3337 InitTargetHSTable.tgm1 +00:333c InitTargetHSTable.tgm3 +00:3341 InitTargetHSTable.deat +00:3346 InitTargetHSTable.shir +00:334b InitTargetHSTable.chil +00:3350 InitTargetHSTable.myco +00:3353 InitTargetHSTable.store +00:3366 sProgressData +00:34b0 sHiscoreDefaultData +00:35f0 InputInit +00:3602 GetInput +00:3602 GetInput.btns +00:360f GetInput.readA +00:3613 GetInput.setA +00:361e GetInput.clearA +00:3621 GetInput.readB +00:3625 GetInput.setB +00:3630 GetInput.clearB +00:3633 GetInput.readSelect +00:3637 GetInput.setSelect +00:3642 GetInput.clearSelect +00:3645 GetInput.readStart +00:3649 GetInput.setStart +00:3654 GetInput.clearStart +00:3657 GetInput.dpad +00:3664 GetInput.readUp +00:3668 GetInput.setUp +00:3673 GetInput.clearUp +00:3676 GetInput.readDown +00:367a GetInput.setDown +00:3685 GetInput.clearDown +00:3688 GetInput.readLeft +00:368c GetInput.setLeft +00:3697 GetInput.clearLeft +00:369a GetInput.readRight +00:369e GetInput.setRight +00:36a9 GetInput.clearRight +00:36ac GetInput.priorities +00:36b9 GetInput.jumps +00:36c8 GetInput.dlru +00:36db GetInput.ulrd +00:36ee GetInput.lrud +00:36fb GetInput.udlr +00:3708 GetInput.zeroud +00:370e GetInput.zerolr +00:3714 GetInput.zerolrd +00:371c GetInput.zerolru +00:3724 ScoreInit +00:374c IncreaseScore +00:3784 IncreaseScore.doConvert +00:379c IncreaseScore.carry +00:379e IncreaseScore.postConvert +00:37b2 IncreaseScore.preAddDigit +00:37da IncreaseScore.addDigit +00:37f0 IncreaseScore.nextDigit +00:3804 SwitchToTitle +00:380d TitleEventLoopHandler +00:3817 TitleVBlankHandler +00:3821 PersistLevel +00:382f DrawSpeedMain +00:387f DrawSpeedSettings +00:38cf TimeInit +00:38ef StartCountdown +00:38fd ResetGameTime +00:3908 CheckTorikan +00:391f CheckTorikan.failure +00:3921 CheckTorikan.success +00:3924 HandleTimers +00:394a HandleTimers.reduce +00:3957 HandleTimers.clock +00:3971 HandleTimers.go +00:3995 SetProgress +00:39a0 SetProgress.loop +00:39a4 SetProgress.correct +00:39cb SetProgress.wvr_u1 +00:39d7 SetProgress.wvr_u2 +00:39e5 SetProgress.wvr_u3 +00:39f1 SetProgress.wvr_u4 +00:39ff SetProgress.wvr_u5 +00:3a0b SetProgress.wvr_u6 +00:3a19 SetProgress.wvr_u7 +00:3a25 SetProgress.wvr_u8 +00:3a33 SetProgress.wvr_u9 +00:3a3f SetProgress.wvr_u10 +00:3a47 Main +00:3a70 Main.notgbc +00:3a76 Main.wvr_u1 +00:3a9d EventLoop +00:3ab3 EventLoop.eventloopjumps +00:3abc EventLoopPostHandler +00:3abe EventLoopPostHandler.wvb_u2 +00:3ad0 EventLoopPostHandler.vblankjumps +00:3ad9 LoadTitleTiles +00:3af7 LoadGameplayTiles +00:3b0d LoadGameplayTiles.gbc +00:3b1c LoadGameplayTiles.dmg +00:3b2b sFramesToCS +00:3b67 UnsafeMemCopy +00:3b70 SafeMemCopy.wvr_u1 +00:3b70 SafeMemCopy +00:3b7f UnsafeMemSet +00:3b87 SafeMemSet +00:3b87 SafeMemSet.wvr_u2 +00:3b95 SwitchToGameplay +00:3b9e SwitchToGameplayBig +00:3ba7 GamePlayEventLoopHandler +00:3bb1 GamePlayBigEventLoopHandler +00:3bbb EnableScreenSquish +00:3bd5 DisableScreenSquish +00:3be0 CopyOAMHandler +00:3bec ClearOAM +00:3c02 BankingInit +00:3c11 OAMDMA +00:3c1b OAMDMAEnd 01:4008 sDMGTSpeedCurve 01:4203 sDMGTSpeedCurveEnd 01:4205 sDMGTSpeedCurveSpecialData diff --git a/src/hiscore.asm b/src/hiscore.asm index 815be31..9964c49 100644 --- a/src/hiscore.asm +++ b/src/hiscore.asm @@ -88,6 +88,8 @@ CheckAndAddHiscore:: .oldgraded ld b, a ld a, [wDisplayedGrade] + cp a, GRADE_NONE + jr z, .notbetter ; If we don't have a grade, we're worse than any grade. cp a, b jr c, .notbetter ; If we're less, we're not better. jr nz, .better ; If we're higher, we're better.