From c241af414f957b3ab8279d07f989931ad3f744ef Mon Sep 17 00:00:00 2001 From: nmlgc Date: Fri, 1 Mar 2019 16:16:54 +0100 Subject: [PATCH] [Reverse-engineering] Current difficulty Funded by -Tom-. --- ReC98.inc | 8 +++ th01_fuuin.asm | 28 ++++----- th01_reiiden.asm | 16 ++--- th02_main.asm | 152 +++++++++++++++++++++++------------------------ th03_mainl.asm | 6 +- th04_main.asm | 68 ++++++++++----------- th04_maine.asm | 22 +++---- th04_op.asm | 44 +++++++------- th05_main.asm | 52 ++++++++-------- th05_maine.asm | 22 +++---- th05_op.asm | 46 +++++++------- 11 files changed, 236 insertions(+), 228 deletions(-) diff --git a/ReC98.inc b/ReC98.inc index be8c0abe..ebf17b88 100644 --- a/ReC98.inc +++ b/ReC98.inc @@ -80,3 +80,11 @@ TILES_X = (PLAYFIELD_W / TILE_W) TILE_FLAG_H = (TILE_H / 2) TILE_FLAGS_Y = TILES_Y * (TILE_H / TILE_FLAG_H) + +; Rank definitions +RANK_EASY = 0 +RANK_NORMAL = 1 +RANK_HARD = 2 +RANK_LUNATIC = 3 +RANK_EXTRA = 4 +RANK_COUNT = 5 diff --git a/th01_fuuin.asm b/th01_fuuin.asm index 8a119b38..1ac81cd5 100644 --- a/th01_fuuin.asm +++ b/th01_fuuin.asm @@ -149,7 +149,7 @@ loc_9F7A: mov byte_14021, al les bx, [bp+reiidenconfig] mov al, es:[bx+reiidenconfig_t.rank] - mov byte_14022, al + mov _rank, al les bx, [bp+reiidenconfig] mov dx, word ptr es:[bx+reiidenconfig_t.score_highest+2] mov ax, word ptr es:[bx+reiidenconfig_t.score_highest] @@ -824,10 +824,10 @@ var_2 = word ptr -2 mov word ptr [bp+var_12], 1AFh mov [bp+var_14], ds mov [bp+var_16], 1C0h - mov al, byte_14022 + mov al, _rank mov ah, 0 mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_A4F5 add bx, bx jmp cs:off_A614[bx] @@ -1031,10 +1031,10 @@ stream = dword ptr -4 enter 46h, 0 push si - mov al, byte_14022 + mov al, _rank mov ah, 0 mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_A659 add bx, bx jmp cs:off_A7C7[bx] @@ -2876,10 +2876,10 @@ stream = dword ptr -4 push offset aHiscore_0 ; "HISCORE" mov cx, 8 call SCOPY@ - mov al, byte_14022 + mov al, _rank mov ah, 0 mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_B45C add bx, bx jmp cs:off_B533[bx] @@ -3149,7 +3149,7 @@ arg_6 = dword ptr 0Ch push 1 call _graph_accesspage_func pop cx - mov al, byte_14022 + mov al, _rank mov ah, 0 shl ax, 2 lea dx, [bp+var_D0] @@ -4777,28 +4777,28 @@ loc_C369: sub si, 0Ah loc_C36C: - cmp byte_14022, 3 + cmp _rank, RANK_LUNATIC jnz short loc_C378 add si, 32h ; '2' jmp short loc_C39A ; --------------------------------------------------------------------------- loc_C378: - cmp byte_14022, 2 + cmp _rank, RANK_HARD jnz short loc_C384 add si, 1Eh jmp short loc_C39A ; --------------------------------------------------------------------------- loc_C384: - cmp byte_14022, 1 + cmp _rank, RANK_NORMAL jnz short loc_C390 add si, 0Ah jmp short loc_C39A ; --------------------------------------------------------------------------- loc_C390: - cmp byte_14022, 0 + cmp _rank, RANK_EASY jnz short loc_C39A sub si, 0Ah @@ -4957,7 +4957,7 @@ var_10 = byte ptr -10h push 1Eh call sub_C82D pop cx - mov al, byte_14022 + mov al, _rank mov ah, 0 shl ax, 2 lea dx, [bp+var_10] @@ -10447,7 +10447,7 @@ word_13EEA dw ? dd ? byte_14020 db ? byte_14021 db ? -byte_14022 db ? +_rank db ? db ? ; void (*font)(void) font dd ? diff --git a/th01_reiiden.asm b/th01_reiiden.asm index 400bb238..7a66216f 100644 --- a/th01_reiiden.asm +++ b/th01_reiiden.asm @@ -15000,7 +15000,7 @@ var_2 = word ptr -2 mov al, _rank cbw mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_139BC add bx, bx jmp cs:off_13A75[bx] @@ -15155,7 +15155,7 @@ s1 = byte ptr -32h mov al, _rank cbw mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_13AB7 add bx, bx jmp cs:off_13BA2[bx] @@ -16750,7 +16750,7 @@ stream = dword ptr -4 mov al, _rank cbw mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_1473E add bx, bx jmp cs:off_14806[bx] @@ -27099,7 +27099,7 @@ arg_0 = word ptr 6 mov byte_34A59, 0 mov byte_34A57, 0 mov byte_39DB3, 40h - cmp _rank, 0 + cmp _rank, RANK_EASY jnz short loc_19E93 mov al, 0Fh jmp short loc_19EBC @@ -27108,7 +27108,7 @@ arg_0 = word ptr 6 loc_19E93: mov al, _rank cbw - cmp ax, 1 + cmp ax, RANK_NORMAL jnz short loc_19EA0 mov al, 0Ch jmp short loc_19EBC @@ -27117,7 +27117,7 @@ loc_19E93: loc_19EA0: mov al, _rank cbw - cmp ax, 2 + cmp ax, RANK_HARD jnz short loc_19EAD mov al, 0Ah jmp short loc_19EBC @@ -27126,7 +27126,7 @@ loc_19EA0: loc_19EAD: mov al, _rank cbw - cmp ax, 3 + cmp ax, RANK_LUNATIC jnz short loc_19EBA mov al, 8 jmp short loc_19EBC @@ -29236,7 +29236,7 @@ include th01_reiiden_2.inc .data -_rank db 1 +_rank db RANK_NORMAL byte_34A31 db 1 _bombs db 1 unk_34A33 db 2 diff --git a/th02_main.asm b/th02_main.asm index 7bb8ecbf..3d913fe5 100644 --- a/th02_main.asm +++ b/th02_main.asm @@ -2028,7 +2028,7 @@ loc_B333: mov word_1E51E, dx loc_B34C: - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jnz short loc_B35A mov byte_1F4AC, 4 jmp short loc_B35F @@ -3287,7 +3287,7 @@ var_2 = word ptr -2 mov al, es:[bx+mikoconfig_t.start_bombs] mov bombs, al mov al, es:[bx+mikoconfig_t.rank] - mov byte_1E364, al + mov _rank, al mov al, es:[bx+mikoconfig_t.start_power] mov power, al cmp power, 0 @@ -3416,9 +3416,9 @@ loc_C400: les bx, mikoconfig cmp es:[bx+mikoconfig_t.continues_used], 3 jnb loc_C4F5 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 4 + cmp ax, RANK_EXTRA jge loc_C4F5 call gaiji_putsa pascal, (18 shl 16) + 12, ds, offset gCONTINUE?, TX_WHITE push 0E500E1h @@ -3740,10 +3740,10 @@ loc_C772: cmp si, 14h jl short loc_C76C mov byte_20276, 0Fh - mov al, byte_1E364 + mov al, _rank cbw mov bx, ax - cmp bx, 4 + cmp bx, RANK_EXTRA ja short loc_C7BC add bx, bx jmp cs:off_C7C0[bx] @@ -6643,11 +6643,11 @@ loc_DBFE: jl loc_DB0D cmp dword_218A4, 0 jz short loc_DC31 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 2 + cmp ax, RANK_HARD jl short loc_DC28 - mov cl, byte_1E364 + mov cl, _rank add cl, 0FFh mov eax, dword_218A4 shl eax, cl @@ -7214,30 +7214,30 @@ sub_E012 proc near call sub_DEAD push (57 shl 16) + 22 push ds - mov al, byte_1E364 + mov al, _rank cbw shl ax, 3 add ax, offset glEASY push ax - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jnz short loc_E0C2 mov ax, TX_GREEN jmp short loc_E0E1 ; --------------------------------------------------------------------------- loc_E0C2: - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 1 + cmp ax, RANK_NORMAL jnz short loc_E0D0 mov ax, TX_CYAN jmp short loc_E0E1 ; --------------------------------------------------------------------------- loc_E0D0: - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 2 + cmp ax, RANK_HARD jnz short loc_E0DE mov ax, TX_MAGENTA jmp short loc_E0E1 @@ -9815,7 +9815,7 @@ var_4 = dword ptr -4 push ss lea ax, [bp+var_6] push ax - mov al, byte_1E364 + mov al, _rank cbw imul ax, 7D0h push ax @@ -10468,34 +10468,34 @@ loc_1033F: mov word_21744, 1 mov word_21746, 40h mov word_21748, 1 - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jnz short loc_10361 mov al, 0F6h jmp short loc_1038A ; --------------------------------------------------------------------------- loc_10361: - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 1 + cmp ax, RANK_NORMAL jnz short loc_1036E mov al, 0 jmp short loc_1038A ; --------------------------------------------------------------------------- loc_1036E: - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 2 + cmp ax, RANK_HARD jnz short loc_1037B mov al, 0 jmp short loc_1038A ; --------------------------------------------------------------------------- loc_1037B: - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 3 + cmp ax, RANK_LUNATIC jnz short loc_10388 mov al, 0Ch jmp short loc_1038A @@ -10507,13 +10507,13 @@ loc_10388: loc_1038A: mov byte_2174A, al mov byte_21752, 0 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 2 + cmp ax, RANK_HARD jz short loc_103A4 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 3 + cmp ax, RANK_LUNATIC jnz short loc_103A9 loc_103A4: @@ -11004,7 +11004,7 @@ arg_0 = dword ptr 4 cmp word ptr es:[bx], 10h jge short loc_1075D inc byte_21753 - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jnz short loc_10755 test byte_21753, 1 jz short loc_10755 @@ -11152,9 +11152,9 @@ loc_10835: cmp ax, [bp+var_4] jle short loc_1085F sar [bp+arg_0], 1 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 3 + cmp ax, RANK_LUNATIC jnz short loc_1084F add [bp+arg_0], 8 @@ -11308,9 +11308,9 @@ loc_1096B: cmp ax, [bp+var_4] jle short loc_10995 sar [bp+arg_0], 1 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 3 + cmp ax, RANK_LUNATIC jnz short loc_10985 add [bp+arg_0], 8 @@ -12541,7 +12541,7 @@ loc_11381: add dl, dl add al, dl mov [si+5536h], al - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_113BD mov byte ptr [bp+var_3], 0Eh jmp short loc_113C1 @@ -13271,7 +13271,7 @@ sub_11877 endp sub_11997 proc near push bp mov bp, sp - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_119B7 mov byte ptr word_2066E, 18h mov byte ptr word_2066E+1, 0 @@ -13610,7 +13610,7 @@ var_2 = word ptr -2 sub sp, 2 cmp word_20650, 18h jl short locret_11C88 - mov al, byte_1E364 + mov al, _rank cbw mov dx, ax add dx, dx @@ -13918,7 +13918,7 @@ loc_11EBE: idiv bx or dx, dx jnz short loc_11F2B - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_11F2B push word_22D98 push word_22D9A @@ -17558,7 +17558,7 @@ sub_13ADE proc far sub word_24E7E, RES_Y loc_13B4E: - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_13B70 mov byte ptr word_2066E, 0Bh mov byte ptr word_2066E+1, 15h @@ -18002,9 +18002,9 @@ var_1 = byte ptr -1 jge short loc_13F80 test byte ptr word_20650, 3 jnz locret_13FE3 - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 2 + cmp ax, RANK_HARD jl short loc_13F62 mov al, byte ptr word_20650 mov [bp+var_1], al @@ -19035,7 +19035,7 @@ loc_147F3: mov ah, 0 and ax, 1 push ax - mov al, byte_1E364 + mov al, _rank cbw pop dx cmp dx, ax @@ -20313,7 +20313,7 @@ loc_15296: mov byte_252F6, 0 mov byte_252F7, 0 mov word_250FE, 0 - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_152FF mov byte ptr word_2066E, 1Ah mov byte ptr word_2066E+1, 15h @@ -24648,9 +24648,9 @@ loc_17864: mov bx, word_26C48 mov eax, [bx+12h] add dword_218AC, eax - mov al, byte_1E364 + mov al, _rank cbw - cmp ax, 3 + cmp ax, RANK_LUNATIC jnz short loc_1789D mov ax, [bx+4] add ax, word_26C4E @@ -25598,7 +25598,7 @@ sub_17F27 endp sub_180AC proc near push bp mov bp, sp - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_180D1 mov byte ptr word_2066E, 25h ; '%' mov byte ptr word_2066E+1, 17h @@ -25886,7 +25886,7 @@ loc_1836D: mov word_20650, 107h loc_1838D: - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_183CC mov ax, word_20650 mov bx, 10h @@ -26544,7 +26544,7 @@ loc_189D0: loc_189DC: cmp word_20650, 64h ; 'd' jle short loc_18A19 - mov al, byte_1E364 + mov al, _rank cbw mov bx, 8 sub bx, ax @@ -26906,7 +26906,7 @@ loc_18CEE: or dx, dx jnz loc_18DA9 call _snd_se_play c, 10 - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_18D75 push word_26C5A push word_26C62 @@ -27220,7 +27220,7 @@ loc_18FD3: add dx, bx mov bx, dx mov [bx-6DE4h], ax - mov al, byte_1E364 + mov al, _rank cbw shl ax, 4 mov dx, 0B4h @@ -27488,7 +27488,7 @@ loc_192CA: call sub_1078E loc_192FF: - mov al, byte_1E364 + mov al, _rank cbw or ax, ax jle short loc_19338 @@ -28210,7 +28210,7 @@ sub_19949 proc near push bp mov bp, sp push si - mov al, byte_1E364 + mov al, _rank cbw imul ax, 14h mov cx, ax @@ -28987,7 +28987,7 @@ var_1 = byte ptr -1 or dx, dx jnz short locret_1A14F call _snd_se_play c, 3 - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jnz short loc_1A12B mov al, 0Fh jmp short loc_1A12D @@ -29055,7 +29055,7 @@ sub_1A151 endp sub_1A17E proc near push bp mov bp, sp - mov al, byte_1E364 + mov al, _rank cbw add ax, ax mov bx, 10h @@ -30786,7 +30786,7 @@ sub_1B19D endp sub_1B214 proc near push bp mov bp, sp - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_1B234 mov byte ptr word_2066E, 17h mov byte ptr word_2066E+1, 11h @@ -31418,7 +31418,7 @@ loc_1B762: mov al, byte ptr word_26D87 add al, 0Dh mov byte ptr word_26D87, al - mov al, byte_1E364 + mov al, _rank cbw mov dx, word_20650 and dx, 1 @@ -31522,7 +31522,7 @@ loc_1B839: loc_1B845: cmp si, 4 jl short loc_1B839 - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_1B8B2 mov si, 1 jmp short loc_1B861 @@ -31543,7 +31543,7 @@ loc_1B861: loc_1B868: cmp word_20650, 1A4h jge short loc_1B88E - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jz short loc_1B8B2 mov si, 1 jmp short loc_1B887 @@ -31581,7 +31581,7 @@ loc_1B8C5: jnz short loc_1B903 mov word_2064E, 82h mov al, 18h - sub al, byte_1E364 + sub al, _rank mov dl, byte ptr word_26D87+1 sub dl, al mov byte ptr word_26D87+1, dl @@ -32983,16 +32983,16 @@ loc_1C473: mov [bx+1Eh], ax mov ax, [bx+1Ah] mov [bp+var_4], ax - cmp byte_1E364, 0 + cmp _rank, RANK_EASY jnz short loc_1C4CE shl [bp+var_4], 1 jmp short loc_1C4DF ; --------------------------------------------------------------------------- loc_1C4CE: - cmp byte_1E364, 2 + cmp _rank, RANK_HARD jz short loc_1C4DC - cmp byte_1E364, 3 + cmp _rank, RANK_LUNATIC jnz short loc_1C4DF loc_1C4DC: @@ -33265,7 +33265,7 @@ sub_1C6C7 proc near push si pushd [HUUHI_DAT] call file_ropen - mov al, byte_1E364 + mov al, _rank cbw imul ax, 0B6h movzx eax, ax @@ -33651,7 +33651,7 @@ loc_1C9C5: jl short loc_1C9AF pushd [HUUHI_DAT] call file_append - mov al, byte_1E364 + mov al, _rank cbw imul ax, 0B6h movzx eax, ax @@ -34093,7 +34093,7 @@ sub_1CD36 endp sub_1CD8E proc far -var_7 = byte ptr -7 +@@rank = byte ptr -7 var_6 = byte ptr -6 enter 8, 0 @@ -34104,13 +34104,13 @@ var_6 = byte ptr -6 push offset unk_1EE02 mov cx, 6 call SCOPY@ - mov al, byte_1E364 - mov [bp+var_7], al + mov al, _rank + mov [bp+@@rank], al les bx, mikoconfig mov al, es:[bx+mikoconfig_t.shottype] - mov byte_1E364, al + mov _rank, al call sub_1C6C7 - mov al, byte_1E364 + mov al, _rank cbw add ax, ax lea dx, [bp+var_6] @@ -34119,8 +34119,8 @@ var_6 = byte ptr -6 mov ax, ss:[bx] mov word_252FE, ax call sub_1C95D - mov al, [bp+var_7] - mov byte_1E364, al + mov al, [bp+@@rank] + mov _rank, al leave retf sub_1CD8E endp @@ -34132,7 +34132,7 @@ sub_1CD8E endp sub_1CDD6 proc far -var_5 = byte ptr -5 +@@rank = byte ptr -5 var_4 = byte ptr -4 enter 6, 0 @@ -34143,9 +34143,9 @@ var_4 = byte ptr -4 push offset unk_1EE08 mov cx, 3 call SCOPY@ - mov al, byte_1E364 - mov [bp+var_5], al - mov byte_1E364, 3 + mov al, _rank + mov [bp+@@rank], al + mov _rank, RANK_LUNATIC call sub_1C6C7 les bx, mikoconfig mov al, es:[bx+mikoconfig_t.shottype] @@ -34162,8 +34162,8 @@ loc_1CE0F: loc_1CE14: call near ptr sub_1C95D - mov al, [bp+var_5] - mov byte_1E364, al + mov al, [bp+@@rank] + mov _rank, al leave retf sub_1CDD6 endp @@ -34300,7 +34300,7 @@ include th02/snd/se[data].asm db 0E0h db 0F0h db 0F8h -byte_1E364 db 1 +_rank db RANK_NORMAL stage_id db 0 aHuuma_cfg db 'huuma.cfg',0 db '<',0 diff --git a/th03_mainl.asm b/th03_mainl.asm index bad9ace4..19f45ea2 100644 --- a/th03_mainl.asm +++ b/th03_mainl.asm @@ -5221,7 +5221,7 @@ var_2 = word ptr -2 call sub_D197 push 16800C7h push 2Fh ; '/' - mov al, byte_10BD6 + mov al, _rank mov ah, 0 shl ax, 2 mov bx, ax @@ -5397,7 +5397,7 @@ loc_C44B: sar ax, 1 mov byte_10BD7, al mov al, es:[bx+0Bh] - mov byte_10BD6, al + mov _rank, al mov al, es:[bx+38h] mov byte_10BD8, al mov al, byte_10BD3 @@ -7104,7 +7104,7 @@ byte_10BD2 db ? byte_10BD3 db ? byte_10BD4 db ? db ? -byte_10BD6 db ? +_rank db ? byte_10BD7 db ? byte_10BD8 db ? db ? ; diff --git a/th04_main.asm b/th04_main.asm index cabf0bc1..14d676fc 100644 --- a/th04_main.asm +++ b/th04_main.asm @@ -560,7 +560,7 @@ loc_ADBB: cmp byte ptr es:[bx+3Eh], 0 jz short loc_ADD7 mov _playperf, 28 - mov byte_25688, 2 + mov _rank, RANK_HARD loc_ADD0: mov byte_266E0, 1 @@ -571,21 +571,21 @@ loc_ADD7: mov _playperf, 16 cmp stage_id, 6 jnz short loc_ADEA - mov byte_25688, 4 + mov _rank, RANK_EXTRA jmp short loc_ADD0 ; --------------------------------------------------------------------------- loc_ADEA: les bx, _humaconfig mov al, es:[bx+0Fh] - mov byte_25688, al + mov _rank, al mov al, es:[bx+49h] mov byte_266E0, al loc_ADFC: call sub_EEB0 call sub_12CC7 - mov al, byte_25688 + mov al, _rank mov ah, 0 mov bx, ax cmp bx, 4 @@ -1181,18 +1181,18 @@ sub_B488 proc near mov stage_id, al cmp stage_id, 6 jnz short loc_B4A4 - mov byte_25688, 4 + mov _rank, RANK_EXTRA jmp short loc_B4AF ; --------------------------------------------------------------------------- loc_B4A4: les bx, _humaconfig mov al, es:[bx+0Fh] - mov byte_25688, al + mov _rank, al loc_B4AF: les bx, off_213DA - mov al, byte_25688 + mov al, _rank add al, 30h ; '0' mov es:[bx+3], al mov word_266DE, 0 @@ -2717,7 +2717,7 @@ include th04/playperf.asm sub_C396 proc far - mov al, byte_25688 + mov al, _rank xor ah, ah add ax, ax mov bx, 0Ah @@ -8641,26 +8641,26 @@ loc_F2E8: call sub_F0A5 push (57 shl 16) + 23 push ds - mov al, byte_25688 + mov al, _rank mov ah, 0 shl ax, 3 add ax, offset glEASY push ax - cmp byte_25688, 0 + cmp _rank, RANK_EASY jnz short loc_F313 mov ax, TX_GREEN jmp short loc_F32E ; --------------------------------------------------------------------------- loc_F313: - cmp byte_25688, 1 + cmp _rank, RANK_NORMAL jnz short loc_F31F mov ax, TX_CYAN jmp short loc_F32E ; --------------------------------------------------------------------------- loc_F31F: - cmp byte_25688, 2 + cmp _rank, RANK_HARD jnz short loc_F32B mov ax, TX_MAGENTA jmp short loc_F32E @@ -15648,7 +15648,7 @@ sub_12AB7 proc near push ds push offset aGensou_scr_1 ; "GENSOU.SCR" call file_ropen - mov al, byte_25688 + mov al, _rank mov ah, 0 imul ax, 0C4h movzx eax, ax @@ -15695,7 +15695,7 @@ sub_12B1E proc near push ds push offset aGensou_scr_2 ; "GENSOU.SCR" call file_append - mov al, byte_25688 + mov al, _rank mov ah, 0 imul ax, 0C4h movzx eax, ax @@ -20164,7 +20164,7 @@ loc_1593A: mov [bp+var_4], 0FFh loc_15977: - cmp byte_25688, 0 + cmp _rank, RANK_EASY jnz short loc_15983 mov [bp+var_4], 0FFh @@ -20254,7 +20254,7 @@ loc_15A0F: loc_15A1E: mov byte ptr [si+28h], 1 mov [bp+var_2], 1 - cmp byte_25688, 3 + cmp _rank, RANK_LUNATIC jnz short loc_15A32 mov ax, 1 jmp short loc_15A34 @@ -21139,7 +21139,7 @@ sub_160A5 proc near mov byte_266E2, 4 mov byte_266E3, 4Ch ; 'L' mov byte_266EC, 26h ; '&' - mov al, byte_25688 + mov al, _rank inc al mov byte_266EF, al mov byte_266EE, 40h @@ -21173,7 +21173,7 @@ loc_160F4: call sub_1CFB5 mov byte_266E2, 4 mov byte_266EE, 40h - mov al, byte_25688 + mov al, _rank inc al mov byte_266EF, al mov byte_25664, 1 @@ -24367,7 +24367,7 @@ loc_17D4C: mov al, [bp+arg_0] mov [si+23h], al mov byte ptr [si+24h], 0 - cmp byte_25688, 3 + cmp _rank, RANK_LUNATIC jnz short loc_17D6B mov ax, 1 jmp short loc_17D6D @@ -27656,7 +27656,7 @@ loc_198E6: loc_198F0: cmp frame_mod4, 0 jnz loc_19989 - cmp byte_25688, 0 + cmp _rank, RANK_EASY jnz short loc_19909 cmp frame_mod8, 0 jz loc_19989 @@ -27672,7 +27672,7 @@ loc_19909: mov byte_266EF, 1 cmp _boss_hp, 700 jg short loc_19942 - cmp byte_25688, 3 + cmp _rank, RANK_LUNATIC jnb short loc_1993D mov byte_266EF, 2 jmp short loc_19942 @@ -30653,7 +30653,7 @@ loc_1B0E0: ; --------------------------------------------------------------------------- loc_1B0F0: - cmp byte_25688, 2 + cmp _rank, RANK_HARD jb short loc_1B120 cmp word_2671A, 96h jge short loc_1B120 @@ -30705,7 +30705,7 @@ loc_1B13C: mov byte_266EC, 26h ; '&' mov byte_266EF, 8 mov byte_266EE, 90h - cmp byte_25688, 0 + cmp _rank, RANK_EASY jz short loc_1B196 push 1 call _randring2_next16_and @@ -30731,7 +30731,7 @@ loc_1B196: ; --------------------------------------------------------------------------- loc_1B19D: - cmp byte_25688, 2 + cmp _rank, RANK_HARD jnb short loc_1B1AF loc_1B1A4: @@ -33680,7 +33680,7 @@ loc_1CAFC: mov al, _playperf mov ah, 0 add di, ax - mov al, byte_25688 + mov al, _rank mov ah, 0 shl ax, 3 add di, ax @@ -33711,10 +33711,10 @@ loc_1CB44: mov [bp+var_9], al mov [bp+var_4], 1 mov [bp+var_6], 1 - mov al, byte_25688 + mov al, _rank mov ah, 0 mov bx, ax - cmp bx, 4 + cmp bx, RANK_EXTRA ja short loc_1CB84 add bx, bx jmp cs:off_1CC29[bx] @@ -35370,10 +35370,10 @@ loc_1D66E: call sub_1D58F loc_1D675: - mov al, byte_25688 + mov al, _rank mov ah, 0 mov bx, ax - cmp bx, 3 + cmp bx, RANK_LUNATIC ja short loc_1D6B5 add bx, bx jmp cs:off_1D6B9[bx] @@ -35574,7 +35574,7 @@ var_4 = dword ptr -4 call text_putsa pascal, (6 shl 16) + 8, ds, offset aPOWERX50_2, TX_WHITE call text_putsa pascal, (6 shl 16) + 10, ds, offset aBONUS_DREAM_2, TX_WHITE call text_putsa pascal, (6 shl 16) + 12, ds, offset aGRAZEX50_2, TX_WHITE - cmp byte_25688, 4 + cmp _rank, RANK_EXTRA jz short loc_1D918 push (6 shl 16) + 14 push ds @@ -35621,7 +35621,7 @@ loc_1D922: push 0Ch push eax call sub_1D48E - cmp byte_25688, 4 + cmp _rank, RANK_EXTRA jz short loc_1D9BD les bx, _humaconfig mov al, es:[bx+0Bh] @@ -36993,7 +36993,7 @@ loc_1E7B5: jnz short loc_1E801 cmp byte_25689, 0 jnz short loc_1E7F2 - cmp byte_25688, 0 + cmp _rank, RANK_EASY jnz short loc_1E801 loc_1E7F2: @@ -37925,7 +37925,7 @@ var_1 = byte ptr -1 add ax, dx mov word ptr dword_266E4+2, ax mov byte_266EC, 30h ; '0' - mov al, byte_25688 + mov al, _rank add al, 3 mov byte_266EF, al mov byte_266F0, 10h @@ -42308,7 +42308,7 @@ word_25680 dw ? dw ? dw ? dw ? -byte_25688 db ? +_rank db ? byte_25689 db ? dd ? ; db ? ; diff --git a/th04_maine.asm b/th04_maine.asm index 14f0535b..64659093 100644 --- a/th04_maine.asm +++ b/th04_maine.asm @@ -3151,7 +3151,7 @@ loc_BC71: mov al, es:[bx+0Fh] loc_BC79: - mov byte_124D2, al + mov _verdict_rank, al push 0B00048h push 10h push ds @@ -3270,10 +3270,10 @@ loc_BDD4: add dword_124CE, eax loc_BE08: - mov al, byte_124D2 + mov al, _verdict_rank mov ah, 0 mov bx, ax - cmp bx, 4 + cmp bx, RANK_EXTRA ja short loc_BE6F add bx, bx jmp cs:off_C0EE[bx] @@ -3400,7 +3400,7 @@ loc_BF6F: les bx, _humaconfig cmp byte ptr es:[bx+30h], 0FDh jnb short loc_BFA1 - cmp byte_124D2, 4 + cmp _verdict_rank, RANK_EXTRA jz short loc_BF96 mov ebx, 2 mov eax, dword_124CE @@ -3803,7 +3803,7 @@ arg_0 = byte ptr 4 push ds push offset aGensou_scr_1 ; "GENSOU.SCR" call file_ropen - mov al, byte_125B7 + mov al, _hiscore_rank mov ah, 0 imul ax, 0C4h movzx eax, ax @@ -3852,7 +3852,7 @@ sub_C316 proc near push ds push offset aGensou_scr_2 ; "GENSOU.SCR" call file_append - mov al, byte_125B7 + mov al, _hiscore_rank mov ah, 0 imul ax, 0C4h movzx eax, ax @@ -4615,7 +4615,7 @@ loc_C87A: mov al, es:[bx+0Fh] loc_C882: - mov byte_125B7, al + mov _hiscore_rank, al les bx, _humaconfig cmp byte ptr es:[bx+12h], 31h ; '1' jnz short loc_C895 @@ -4643,7 +4643,7 @@ loc_C897: les bx, _humaconfig cmp byte ptr es:[bx+49h], 0 jnz short loc_C8CB - cmp byte_125B7, 4 + cmp _hiscore_rank, RANK_EXTRA jnz short loc_C8D9 loc_C8CB: @@ -4678,7 +4678,7 @@ loc_C909: jz short loc_C922 cmp byte ptr es:[bx+30h], 0FDh jz short loc_C922 - cmp byte_125B7, 0 + cmp _hiscore_rank, RANK_EASY jnz short loc_C95E loc_C922: @@ -7960,7 +7960,7 @@ fp_124C8 dw ? byte_124CC db ? db ? ; dword_124CE dd ? -byte_124D2 db ? +_verdict_rank db ? unk_124D3 db ? ; dd ? ; dd ? ; @@ -8031,7 +8031,7 @@ byte_125A0 db ? dd ? ; db ? ; byte_125B6 db ? -byte_125B7 db ? +_hiscore_rank db ? word_125B8 dw ? end diff --git a/th04_op.asm b/th04_op.asm index 12e92952..6e7ba391 100644 --- a/th04_op.asm +++ b/th04_op.asm @@ -3352,7 +3352,7 @@ sub_C733 proc near push ds push offset aGensou_scr ; "GENSOU.SCR" call file_ropen - mov al, byte_1327B + mov al, _rank mov ah, 0 imul ax, 0C4h movzx eax, ax @@ -3730,14 +3730,14 @@ loc_CA5B: push 9 call sub_C8F5 push 1F00178h - mov al, byte_1327B + mov al, _rank mov ah, 0 add ax, ax add ax, 0Ah push ax call super_put push 2300178h - mov al, byte_1327B + mov al, _rank mov ah, 0 add ax, ax add ax, 0Bh @@ -3765,7 +3765,7 @@ sub_CA94 proc near les bx, _humaconfig assume es:nothing mov al, es:[bx+0Fh] - mov byte_1327B, al + mov _rank, al call sub_C733 call pi_slot_load pascal, 0, ds, offset aHi01_pi @@ -3788,9 +3788,9 @@ loc_CAE4: jnz short loc_CB58 test _input.lo, low INPUT_LEFT jz short loc_CB36 - cmp byte_1327B, 0 + cmp _rank, RANK_EASY jz short loc_CB36 - dec byte_1327B + dec _rank mov PaletteTone, 0 call far ptr palette_show call sub_C733 @@ -3801,9 +3801,9 @@ loc_CAE4: loc_CB36: test _input.lo, low INPUT_RIGHT jz short loc_CAE4 - cmp byte_1327B, 4 + cmp _rank, RANK_EXTRA jnb short loc_CAE4 - inc byte_1327B + inc _rank mov PaletteTone, 0 call far ptr palette_show call sub_C733 @@ -3846,7 +3846,7 @@ sub_CA94 endp sub_CBE3 proc near push bp mov bp, sp - mov byte_1327B, 0 + mov _rank, RANK_EASY jmp loc_CC6F ; --------------------------------------------------------------------------- @@ -3854,61 +3854,61 @@ loc_CBEE: call sub_C733 or al, al jnz loc_CC78 - mov al, byte_1327B + mov al, _rank mov ah, 0 mov dl, byte_131A0 mov bx, ax mov [bx+3F3Ch], dl - mov al, byte_1327B + mov al, _rank mov ah, 0 mov dl, byte_13264 mov bx, ax mov [bx+3F41h], dl - mov al, byte_1327B + mov al, _rank mov ah, 0 mov bx, ax cmp byte ptr [bx+3F3Ch], 3 jbe short loc_CC2F - mov al, byte_1327B + mov al, _rank mov ah, 0 mov bx, ax mov byte ptr [bx+3F3Ch], 0 loc_CC2F: - mov al, byte_1327B + mov al, _rank mov ah, 0 mov bx, ax cmp byte ptr [bx+3F41h], 3 jbe short loc_CC49 - mov al, byte_1327B + mov al, _rank mov ah, 0 mov bx, ax mov byte ptr [bx+3F41h], 0 loc_CC49: - cmp byte_1327B, 0 + cmp _rank, RANK_EASY jz short loc_CC6B - mov al, byte_1327B + mov al, _rank mov ah, 0 mov bx, ax mov al, [bx+3F3Ch] - mov dl, byte_1327B + mov dl, _rank mov dh, 0 mov bx, dx or al, [bx+3F41h] or byte_13286, al loc_CC6B: - inc byte_1327B + inc _rank loc_CC6F: - cmp byte_1327B, 5 + cmp _rank, RANK_COUNT jb loc_CBEE loc_CC78: les bx, _humaconfig mov al, es:[bx+0Fh] - mov byte_1327B, al + mov _rank, al push ds push offset aScnum_bft ; "scnum.bft" call super_entry_bfnt @@ -6587,7 +6587,7 @@ byte_13264 db ? dd ? ; db ? ; db ? ; -byte_1327B db ? +_rank db ? dd ? ; dd ? ; db ? ; diff --git a/th05_main.asm b/th05_main.asm index bbd3f3b5..b8481e74 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -628,7 +628,7 @@ loc_B112: cmp byte ptr es:[bx+1Fh], 5 jnb short loc_B13E mov _playperf, 40 - mov byte_25FEB, 3 + mov _rank, RANK_LUNATIC jmp short loc_B156 ; --------------------------------------------------------------------------- @@ -643,7 +643,7 @@ loc_B145: jnz short loc_B15D loc_B151: - mov byte_25FEB, 4 + mov _rank, RANK_EXTRA loc_B156: mov byte_25FF2, 1 @@ -653,17 +653,17 @@ loc_B156: loc_B15D: les bx, _ksoconfig mov al, es:[bx+11h] - mov byte_25FEB, al + mov _rank, al mov al, es:[bx+16h] mov byte_25FF2, al loc_B16F: call sub_10398 call sub_E8FE - mov al, byte_25FEB + mov al, _rank mov ah, 0 mov bx, ax - cmp bx, 4 + cmp bx, RANK_EXTRA ja loc_B222 add bx, bx jmp cs:off_B225[bx] @@ -1360,14 +1360,14 @@ sub_B827 proc near mov stage_id, al cmp stage_id, 6 jnz short loc_B843 - mov byte_25FEB, 4 + mov _rank, RANK_EXTRA jmp short loc_B84E ; --------------------------------------------------------------------------- loc_B843: les bx, _ksoconfig mov al, es:[bx+11h] - mov byte_25FEB, al + mov _rank, al loc_B84E: mov word_25FF0, 0 @@ -6849,7 +6849,7 @@ sub_E752 endp sub_E758 proc far - mov al, byte_25FEB + mov al, _rank loc_E75B: xor ah, ah @@ -6955,7 +6955,7 @@ loc_E7E7: xor ah, ah mov al, playchar imul ax, 5 - add al, byte_25FEB + add al, _rank imul ax, 60h mov dx, ax xor cx, cx @@ -6991,7 +6991,7 @@ sub_E813 proc near xor ah, ah mov al, playchar imul ax, 5 - add al, byte_25FEB + add al, _rank imul ax, 60h mov dx, ax xor cx, cx @@ -10195,26 +10195,26 @@ loc_10796: call sub_10625 push (57 shl 16) + 23 push ds - mov al, byte_25FEB + mov al, _rank mov ah, 0 shl ax, 3 add ax, offset glEASY push ax - cmp byte_25FEB, 0 + cmp _rank, RANK_EASY jnz short loc_10812 mov ax, TX_GREEN jmp short loc_1082D ; --------------------------------------------------------------------------- loc_10812: - cmp byte_25FEB, 1 + cmp _rank, RANK_NORMAL jnz short loc_1081E mov ax, TX_CYAN jmp short loc_1082D ; --------------------------------------------------------------------------- loc_1081E: - cmp byte_25FEB, 2 + cmp _rank, RANK_HARD jnz short loc_1082A mov ax, TX_MAGENTA jmp short loc_1082D @@ -14287,7 +14287,7 @@ loc_128AD: call sparks_add_random pascal, word ptr [si], word ptr [si+2], large (((8 shl 4) shl 16) or 1) loc_128CA: - cmp byte_25FEB, 0 + cmp _rank, RANK_EASY jnz short loc_128D8 cmp frame_mod4, 0 jnz short loc_128EA @@ -19212,7 +19212,7 @@ loc_155C7: mov dl, 0FFh loc_155E0: - cmp byte_25FEB, 0 + cmp _rank, RANK_EASY jnz short loc_155E9 mov dl, 0FFh @@ -19334,7 +19334,7 @@ loc_1568E: loc_15694: mov byte ptr [si+22h], 1 - cmp byte_25FEB, 3 + cmp _rank, RANK_LUNATIC jnz short loc_1568E inc dl jmp short loc_1568E @@ -20509,7 +20509,7 @@ loc_15F8F: mov al, es:[bx+6] mov [si+36h], al mov byte ptr [si+21h], 0 - cmp byte_25FEB, 3 + cmp _rank, RANK_LUNATIC jnz short loc_15FB7 mov ax, 1 jmp short loc_15FB9 @@ -21163,7 +21163,7 @@ loc_164BD: call sub_163DF loc_164C4: - mov al, byte_25FEB + mov al, _rank mov ah, 0 mov bx, ax cmp bx, 3 @@ -24209,7 +24209,7 @@ loc_17E78: jnz loc_17FB7 mov byte_25FF8, 0 mov di, 2Ah ; '*' - mov al, byte_25FEB + mov al, _rank mov ah, 0 shl ax, 3 add di, ax @@ -24241,7 +24241,7 @@ loc_17EC3: mov [bp+var_9], al mov [bp+var_4], 1 mov [bp+var_6], 1 - cmp byte_25FEB, 4 + cmp _rank, RANK_EXTRA jnz short loc_17EE9 mov ax, 640h jmp short loc_17EFA @@ -30427,7 +30427,7 @@ sub_1B557 proc near mov byte_26000, 4 mov byte_26001, 0Ah mov byte ptr word_25FFA+1, 32h ; '2' - mov al, byte_25FEB + mov al, _rank add al, 5 mov byte ptr dword_26002, al mov byte ptr word_26006+1, 36h ; '6' @@ -30889,7 +30889,7 @@ sub_1B973 proc near mov byte_26001, 3 mov byte_2C976, 1 mov byte ptr word_25FFA+1, 54h ; 'T' - mov al, byte_25FEB + mov al, _rank add al, al add al, 4 mov byte ptr dword_26002, al @@ -31353,7 +31353,7 @@ sub_1BDD0 proc near mov byte_2C976, 1 mov byte_26001, 2 mov byte ptr word_25FFA+1, 74h ; 't' - mov al, byte_25FEB + mov al, _rank add al, 4 mov byte ptr dword_26002+2, al mov byte ptr dword_26002+3, 10h @@ -31944,7 +31944,7 @@ var_2 = word ptr -2 mov _laser_template.coords.LASER_width, 8 call _randring2_next16 mov [bp+var_2], ax - mov al, byte_25FEB + mov al, _rank mov ah, 0 add ax, 5 mov word_2CE3C, ax @@ -40196,7 +40196,7 @@ word_25FE6 dw ? byte_25FE8 db ? byte_25FE9 db ? stage_id db ? -byte_25FEB db ? +_rank db ? include th04/playperf[bss].asm playchar db ? word_25FF0 dw ? diff --git a/th05_maine.asm b/th05_maine.asm index bfda1e10..65b52bdb 100644 --- a/th05_maine.asm +++ b/th05_maine.asm @@ -2204,7 +2204,7 @@ arg_0 = word ptr 4 call file_ropen mov ax, [bp+arg_0] imul ax, 5 - mov dl, byte_15177 + mov dl, _hiscore_rank mov dh, 0 add ax, dx imul ax, 60h @@ -2250,7 +2250,7 @@ sub_B6A3 proc near mov al, byte ptr word_15178 mov ah, 0 imul ax, 5 - mov dl, byte_15177 + mov dl, _hiscore_rank mov dh, 0 add ax, dx imul ax, 60h @@ -2473,7 +2473,7 @@ loc_B84F: ; --------------------------------------------------------------------------- loc_B86C: - cmp byte_15177, 4 + cmp _hiscore_rank, RANK_EXTRA jnb short loc_B88B les bx, _ksoconfig mov al, es:[bx+13h] @@ -3852,7 +3852,7 @@ loc_C256: mov al, es:[bx+11h] loc_C25E: - mov byte_15177, al + mov _hiscore_rank, al les bx, _ksoconfig mov al, es:[bx+14h] mov byte ptr word_15178, al @@ -3883,7 +3883,7 @@ loc_C28C: les bx, _ksoconfig cmp byte ptr es:[bx+16h], 0 jnz short loc_C2AD - cmp byte_15177, 4 + cmp _hiscore_rank, RANK_EXTRA jnz short loc_C2BB loc_C2AD: @@ -4959,7 +4959,7 @@ loc_CBDB: mov al, es:[bx+11h] loc_CBE3: - mov byte_15186, al + mov _verdict_rank, al mov ax, word_116E2 add ax, 0A0h push ax @@ -4968,7 +4968,7 @@ loc_CBE3: push ax push 10h push ds - mov al, byte_15186 + mov al, _verdict_rank mov ah, 0 shl ax, 3 add ax, offset grEASY @@ -5143,10 +5143,10 @@ loc_CDCB: add dword_1517E, eax loc_CDF3: - mov al, byte_15186 + mov al, _verdict_rank mov ah, 0 mov bx, ax - cmp bx, 4 + cmp bx, RANK_EXTRA ja loc_CEAF add bx, bx jmp cs:off_D165[bx] @@ -11669,14 +11669,14 @@ byte_15078 db ? dd ? ; db ? ; byte_15176 db ? -byte_15177 db ? +_hiscore_rank db ? word_15178 dw ? dw ? byte_1517C db ? db ? dword_1517E dd ? dword_15182 dd ? -byte_15186 db ? +_verdict_rank db ? byte_15187 db ? dd ? ; dd ? ; diff --git a/th05_op.asm b/th05_op.asm index e49c29bf..5efabd83 100644 --- a/th05_op.asm +++ b/th05_op.asm @@ -3912,7 +3912,7 @@ arg_0 = word ptr 4 call file_ropen mov ax, [bp+arg_0] imul ax, 5 - mov dl, byte_14101 + mov dl, _hiscore_rank mov dh, 0 add ax, dx imul ax, 60h @@ -4258,14 +4258,14 @@ loc_CC27: cmp si, 4 jl short loc_CC13 push 1F00178h - mov al, byte_14101 + mov al, _hiscore_rank mov ah, 0 add ax, ax add ax, 14h push ax call super_put push 2300178h - mov al, byte_14101 + mov al, _hiscore_rank mov ah, 0 add ax, ax add ax, 15h @@ -4293,7 +4293,7 @@ sub_CC5C proc near call palette_black_out les bx, _ksoconfig mov al, es:[bx+11h] - mov byte_14101, al + mov _hiscore_rank, al call pi_slot_load pascal, 0, ds, offset aHi01_pi loc_CC9F: @@ -4315,9 +4315,9 @@ loc_CCA9: jnz short loc_CD17 test _input.lo, low INPUT_LEFT jz short loc_CCF8 - cmp byte_14101, 0 + cmp _hiscore_rank, RANK_EASY jz short loc_CCF8 - dec byte_14101 + dec _hiscore_rank mov PaletteTone, 0 call far ptr palette_show call sub_CBDC @@ -4327,9 +4327,9 @@ loc_CCA9: loc_CCF8: test _input.lo, low INPUT_RIGHT jz short loc_CCA9 - cmp byte_14101, 4 + cmp _hiscore_rank, RANK_EXTRA jnb short loc_CCA9 - inc byte_14101 + inc _hiscore_rank mov PaletteTone, 0 call far ptr palette_show jmp short loc_CC9F @@ -4378,7 +4378,7 @@ sub_CD94 proc near ; --------------------------------------------------------------------------- loc_CDA1: - mov byte_14101, 0 + mov _hiscore_rank, RANK_EASY jmp short loc_CE06 ; --------------------------------------------------------------------------- @@ -4389,41 +4389,41 @@ loc_CDA8: jnz short loc_CE0D mov bx, si imul bx, 5 - mov al, byte_14101 + mov al, _hiscore_rank mov ah, 0 add bx, ax mov al, byte_1409E mov [bx+5122h], al mov bx, si imul bx, 5 - mov al, byte_14101 + mov al, _hiscore_rank mov ah, 0 add bx, ax cmp byte ptr [bx+5122h], 80h jz short loc_CDE7 mov bx, si imul bx, 5 - mov al, byte_14101 + mov al, _hiscore_rank mov ah, 0 add bx, ax mov byte ptr [bx+5122h], 0 loc_CDE7: - cmp byte_14101, 4 + cmp _hiscore_rank, RANK_EXTRA jnb short loc_CE02 mov bx, si imul bx, 5 - mov al, byte_14101 + mov al, _hiscore_rank mov ah, 0 add bx, ax mov al, [bx+5122h] or byte_14116, al loc_CE02: - inc byte_14101 + inc _hiscore_rank loc_CE06: - cmp byte_14101, 5 + cmp _hiscore_rank, RANK_COUNT jb short loc_CDA8 loc_CE0D: @@ -4434,7 +4434,7 @@ loc_CE0E: jl short loc_CDA1 les bx, _ksoconfig mov al, es:[bx+11h] - mov byte_14101, al + mov _hiscore_rank, al push ds push offset aScnum_bft ; "scnum.bft" call super_entry_bfnt @@ -4674,7 +4674,7 @@ loc_CF8C: mov al, byte ptr word_14118 mov ah, 0 imul ax, 5 - mov dl, byte_1411A + mov dl, _rank mov dh, 0 add ax, dx mov bx, ax @@ -4727,7 +4727,7 @@ loc_D054: mov al, byte ptr word_14118 mov ah, 0 imul ax, 5 - mov dl, byte_1411A + mov dl, _rank mov dh, 0 add ax, dx mov bx, ax @@ -4842,7 +4842,7 @@ loc_D146: les bx, _ksoconfig cmp byte ptr es:[bx+13h], 6 jnz short loc_D18A - mov byte_1411A, 4 + mov _rank, RANK_EXTRA mov byte ptr word_14118, 0FFh mov [bp+var_4], 0 jmp short loc_D182 @@ -4881,7 +4881,7 @@ loc_D19C: jl short loc_D191 les bx, _ksoconfig mov al, es:[bx+11h] - mov byte_1411A, al + mov _rank, al mov byte ptr word_14118, 0 loc_D1B2: @@ -7296,7 +7296,7 @@ byte_140A2 db ? dd ? ; db ? ; db ? ; -byte_14101 db ? +_hiscore_rank db ? dd ? ; dd ? ; dd ? ; @@ -7305,7 +7305,7 @@ byte_14101 db ? byte_14116 db ? db ? word_14118 dw ? -byte_1411A db ? +_rank db ? dd ? ; byte_1411F db ? byte_14120 db ?