diff --git a/libs/master.lib/js[bss].asm b/libs/master.lib/js[bss].asm new file mode 100644 index 00000000..a7c1f60c --- /dev/null +++ b/libs/master.lib/js[bss].asm @@ -0,0 +1,3 @@ + public js_stat,_js_stat +_js_stat label word +js_stat dw ?,? diff --git a/libs/master.lib/js[data].asm b/libs/master.lib/js[data].asm new file mode 100644 index 00000000..a707ec20 --- /dev/null +++ b/libs/master.lib/js[data].asm @@ -0,0 +1,15 @@ + public js_bexist,_js_bexist +_js_bexist label word +js_bexist dw 0 + + public js_saj_port,_js_saj_port +_js_saj_port label word +js_saj_port dw 0 + + public js_2player,_js_2player +_js_2player label word +js_2player dw 0 + + public js_shift,_js_shift +_js_shift label word +js_shift dw 0 diff --git a/th03_main.asm b/th03_main.asm index 08e93202..2119e518 100644 --- a/th03_main.asm +++ b/th03_main.asm @@ -154,7 +154,7 @@ sub_2C00 proc far popf loc_2C19: - or word_1E716, si + or js_stat, si pop di pop si pop bp @@ -9418,7 +9418,7 @@ sub_EA8C proc far mov word_1EFF6, ax mov word_1EFF8, ax mov word ptr unk_1EFFA, ax - mov word_1E716, ax + mov js_stat, ax jmp short $+2 mov bl, 2 xor ax, ax @@ -9640,7 +9640,7 @@ sub_ED54 proc far cmp js_bexist, 0 jz short loc_ED6F call sub_2C00 - mov ax, word_1E716 + mov ax, js_stat or word ptr unk_1EFFA, ax loc_ED6F: @@ -9675,7 +9675,7 @@ sub_ED82 proc far cmp js_bexist, 0 jz short loc_EDA2 call sub_2C00 - mov ax, word_1E716 + mov ax, js_stat mov word_1EFF6, ax mov ax, word ptr unk_1EFFA mov word_1EFF8, ax @@ -9697,7 +9697,7 @@ sub_EDA4 proc far cmp js_bexist, 0 jz short loc_EDC4 call sub_2C00 - mov ax, word_1E716 + mov ax, js_stat mov word_1EFF8, ax mov ax, word ptr unk_1EFFA mov word_1EFF6, ax @@ -9721,7 +9721,7 @@ sub_EDC6 proc far cmp js_bexist, 0 jz short loc_EDE8 call sub_2C00 - mov ax, word_1E716 + mov ax, js_stat or word_1EFF6, ax loc_EDE8: @@ -9745,7 +9745,7 @@ sub_EDF0 proc far cmp js_bexist, 0 jz short loc_EE15 call sub_2C00 - mov ax, word_1E716 + mov ax, js_stat or word_1EFF8, ax loc_EE15: @@ -9790,7 +9790,7 @@ sub_EE47 proc far cmp js_bexist, 0 jz short loc_EE62 call sub_2C00 - mov ax, word_1E716 + mov ax, js_stat or word ptr unk_1EFFA, ax loc_EE62: @@ -36986,13 +36986,7 @@ include libs/master.lib/dos_ropen[data].asm include libs/master.lib/gaiji_backup[data].asm include libs/master.lib/gaiji_entry_bfnt[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm include libs/master.lib/rand[data].asm @@ -38076,9 +38070,7 @@ include libs/master.lib/clip[bss].asm include libs/master.lib/fil[bss].asm include libs/master.lib/grcg_circle[bss].asm include libs/master.lib/grcg_triangle[bss].asm -word_1E716 dw ? - db ? ; - db ? ; +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th03_mainl.asm b/th03_mainl.asm index fba437e1..2c8d48f9 100644 --- a/th03_mainl.asm +++ b/th03_mainl.asm @@ -160,7 +160,7 @@ sub_2AEA proc far popf loc_2B03: - or word_F80A, si + or js_stat, si pop di pop si pop bp @@ -6379,7 +6379,7 @@ sub_CB68 proc far mov word_100F8, ax mov word_100FA, ax mov word_100FC, ax - mov word_F80A, ax + mov js_stat, ax jmp short $+2 mov bl, 2 xor ax, ax @@ -7363,7 +7363,7 @@ sub_D5A2 proc far cmp js_bexist, 0 jz short loc_D5BD call sub_2AEA - mov ax, word_F80A + mov ax, js_stat or word_100FC, ax loc_D5BD: @@ -7386,7 +7386,7 @@ sub_D5A2 endp cmp js_bexist, 0 jz short loc_D5F0 call sub_2AEA - mov ax, word_F80A + mov ax, js_stat mov word_100F8, ax mov ax, word_100FC mov word_100FA, ax @@ -7401,7 +7401,7 @@ loc_D5F0: cmp js_bexist, 0 jz short loc_D612 call sub_2AEA - mov ax, word_F80A + mov ax, js_stat mov word_100FA, ax mov ax, word_100FC mov word_100F8, ax @@ -7418,7 +7418,7 @@ loc_D612: cmp js_bexist, 0 jz short loc_D636 call sub_2AEA - mov ax, word_F80A + mov ax, js_stat or word_100F8, ax loc_D636: @@ -7435,7 +7435,7 @@ loc_D636: cmp js_bexist, 0 jz short loc_D663 call sub_2AEA - mov ax, word_F80A + mov ax, js_stat or word_100FA, ax loc_D663: @@ -7466,7 +7466,7 @@ loc_D687: cmp js_bexist, 0 jz short loc_D6B0 call sub_2AEA - mov ax, word_F80A + mov ax, js_stat or word_100FC, ax loc_D6B0: @@ -7724,13 +7724,7 @@ include libs/master.lib/dos_ropen[data].asm include libs/master.lib/gaiji_backup[data].asm include libs/master.lib/gaiji_entry_bfnt[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm include libs/master.lib/rand[data].asm @@ -8165,9 +8159,7 @@ byte_F7E5 db ? dd ? ; dd ? ; include libs/master.lib/fil[bss].asm -word_F80A dw ? - db ? ; - db ? ; +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th03_op.asm b/th03_op.asm index ae0cbae2..cd84e26d 100644 --- a/th03_op.asm +++ b/th03_op.asm @@ -163,7 +163,7 @@ sub_2DF4 proc far popf loc_2E0D: - or word_E9A4, si + or js_stat, si pop di pop si pop bp @@ -4756,7 +4756,7 @@ sub_C1B4 proc far mov word_F292, ax mov word_F294, ax mov word_F296, ax - mov word_E9A4, ax + mov js_stat, ax jmp short $+2 mov bl, 2 xor ax, ax @@ -5598,7 +5598,7 @@ sub_C986 proc far cmp js_bexist, 0 jz short loc_C9A1 call sub_2DF4 - mov ax, word_E9A4 + mov ax, js_stat or word_F296, ax loc_C9A1: @@ -5633,7 +5633,7 @@ sub_C9B4 proc far cmp js_bexist, 0 jz short loc_C9D4 call sub_2DF4 - mov ax, word_E9A4 + mov ax, js_stat mov word_F292, ax mov ax, word_F296 mov word_F294, ax @@ -5655,7 +5655,7 @@ sub_C9D6 proc far cmp js_bexist, 0 jz short loc_C9F6 call sub_2DF4 - mov ax, word_E9A4 + mov ax, js_stat mov word_F294, ax mov ax, word_F296 mov word_F292, ax @@ -5679,7 +5679,7 @@ sub_C9F8 proc far cmp js_bexist, 0 jz short loc_CA1A call sub_2DF4 - mov ax, word_E9A4 + mov ax, js_stat or word_F292, ax loc_CA1A: @@ -5703,7 +5703,7 @@ sub_CA22 proc far cmp js_bexist, 0 jz short loc_CA47 call sub_2DF4 - mov ax, word_E9A4 + mov ax, js_stat or word_F294, ax loc_CA47: @@ -5748,7 +5748,7 @@ sub_CA79 proc far cmp js_bexist, 0 jz short loc_CA94 call sub_2DF4 - mov ax, word_E9A4 + mov ax, js_stat or word_F296, ax loc_CA94: @@ -5995,13 +5995,7 @@ include libs/master.lib/dos_ropen[data].asm include libs/master.lib/gaiji_backup[data].asm include libs/master.lib/gaiji_entry_bfnt[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm include libs/master.lib/rand[data].asm @@ -6188,9 +6182,7 @@ byte_E97C db ? fp_E97E dw ? include libs/master.lib/clip[bss].asm include libs/master.lib/fil[bss].asm -word_E9A4 dw ? - db ? - db ? ; +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th04_main.asm b/th04_main.asm index 01d7117b..a32973a5 100644 --- a/th04_main.asm +++ b/th04_main.asm @@ -18393,7 +18393,7 @@ loc_13792: sub_1379C proc near xor ax, ax mov word_24CB4, ax - mov word_23DBE, ax + mov js_stat, ax sub_1379C endp ; sp-analysis failed @@ -42961,13 +42961,7 @@ include libs/master.lib/get_machine_at[data].asm include libs/master.lib/gaiji_backup[data].asm include libs/master.lib/gaiji_entry_bfnt[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/machine[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm @@ -46399,9 +46393,7 @@ dword_23D92 dd ? dd ? include libs/master.lib/fil[bss].asm include libs/master.lib/grcg_circle[bss].asm -word_23DBE dw ? - db ? - db ? +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th04_maine.asm b/th04_maine.asm index 7d5be705..df31995e 100644 --- a/th04_maine.asm +++ b/th04_maine.asm @@ -5970,7 +5970,7 @@ sub_D43C endp sub_D48A proc near xor ax, ax mov word_10072, ax - mov word_F3F6, ax + mov js_stat, ax sub_D48A endp ; sp-analysis failed @@ -6498,10 +6498,7 @@ include libs/master.lib/get_machine_at[data].asm include libs/master.lib/gaiji_backup[data].asm include libs/master.lib/gaiji_entry_bfnt[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - dw 0 - dw 0 - dw 0 +include libs/master.lib/js[data].asm include libs/master.lib/machine[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm @@ -6773,9 +6770,7 @@ dword_F3CE dd ? dd ? dd ? include libs/master.lib/fil[bss].asm -word_F3F6 dw ? - db ? - db ? +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th04_op.asm b/th04_op.asm index 90a272f8..5ccbc8e2 100644 --- a/th04_op.asm +++ b/th04_op.asm @@ -6211,7 +6211,7 @@ sub_E176 endp sub_E1DC proc near xor ax, ax mov word_11A50, ax - mov word_10DD2, ax + mov js_stat, ax sub_E1DC endp ; sp-analysis failed @@ -6952,13 +6952,7 @@ include libs/master.lib/get_machine_at[data].asm include libs/master.lib/gaiji_backup[data].asm include libs/master.lib/gaiji_entry_bfnt[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/machine[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm @@ -7247,9 +7241,7 @@ byte_10DAC db ? byte_10DAD db ? include libs/master.lib/clip[bss].asm include libs/master.lib/fil[bss].asm -word_10DD2 dw ? - db ? - db ? +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th05_main.asm b/th05_main.asm index 1c40608f..491852d0 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -21210,7 +21210,7 @@ sub_14F86 endp sub_14FCE proc near xor ax, ax mov word_23A56, ax - mov word_23038, ax + mov js_stat, ax sub_14FCE endp ; sp-analysis failed @@ -41879,13 +41879,7 @@ include libs/master.lib/dos_ropen[data].asm include libs/master.lib/get_machine_98[data].asm include libs/master.lib/get_machine_at[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/machine[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm @@ -45075,8 +45069,7 @@ fp_2300E dw ? include libs/master.lib/clip[bss].asm include libs/master.lib/fil[bss].asm include libs/master.lib/grcg_circle[bss].asm -word_23038 dw ? - dw ? +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th05_maine.asm b/th05_maine.asm index 7423f692..efeabf6b 100644 --- a/th05_maine.asm +++ b/th05_maine.asm @@ -9105,7 +9105,7 @@ sub_F0B4 endp sub_F0FC proc near xor ax, ax mov word_12AFA, ax - mov word_11E96, ax + mov js_stat, ax sub_F0FC endp ; sp-analysis failed @@ -9692,13 +9692,7 @@ include libs/master.lib/dos_ropen[data].asm include libs/master.lib/get_machine_98[data].asm include libs/master.lib/get_machine_at[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/machine[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm @@ -10180,9 +10174,7 @@ dword_11E6E dd ? dd ? dd ? include libs/master.lib/fil[bss].asm -word_11E96 dw ? - db ? - db ? +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm diff --git a/th05_op.asm b/th05_op.asm index e9d6f535..771d1fcc 100644 --- a/th05_op.asm +++ b/th05_op.asm @@ -6461,7 +6461,7 @@ sub_DF12 endp sub_DF8E proc near xor ax, ax mov word_12A72, ax - mov word_11DFA, ax + mov js_stat, ax sub_DF8E endp ; sp-analysis failed @@ -7177,13 +7177,7 @@ include libs/master.lib/dos_ropen[data].asm include libs/master.lib/get_machine_98[data].asm include libs/master.lib/get_machine_at[data].asm include libs/master.lib/grp[data].asm -js_bexist dw 0 - db 0 - db 0 - db 0 - db 0 - db 0 - db 0 +include libs/master.lib/js[data].asm include libs/master.lib/machine[data].asm include libs/master.lib/pal[data].asm include libs/master.lib/pf[data].asm @@ -8033,9 +8027,7 @@ byte_11DD4 db ? byte_11DD5 db ? include libs/master.lib/clip[bss].asm include libs/master.lib/fil[bss].asm -word_11DFA dw ? - db ? - db ? +include libs/master.lib/js[bss].asm include libs/master.lib/pal[bss].asm include libs/master.lib/vs[bss].asm include libs/master.lib/vsync[bss].asm