diff --git a/th03_op.asm b/th03_op.asm index d68420cf..ceda5aac 100644 --- a/th03_op.asm +++ b/th03_op.asm @@ -1636,7 +1636,7 @@ arg_2 = byte ptr 6 mov ah, 0 shl ax, 2 mov bx, ax - pushd dword ptr [bx+5F2h] + pushd _MUSIC_TITLES[bx] call graph_putsa_fx graph_accesspage byte ptr word_F828+1 push 10h @@ -1653,7 +1653,7 @@ arg_2 = byte ptr 6 mov ah, 0 shl ax, 2 mov bx, ax - pushd dword ptr [bx+5F2h] + pushd _MUSIC_TITLES[bx] call graph_putsa_fx leave retn 4 @@ -2275,7 +2275,7 @@ loc_AD52: mov ah, 0 shl ax, 2 mov bx, ax - pushd dword ptr [bx+646h] + pushd _MUSIC_FILES[bx] call snd_load add sp, 6 kajacall KAJA_SONG_PLAY @@ -4756,6 +4756,8 @@ include libs/master.lib/respal_exist[data].asm include libs/master.lib/draw_trapezoid[data].asm include th02/formats/pfopen[data].asm include th03/formats/cdg[data].asm +public _MUSIC_TITLES +_MUSIC_TITLES label dword dd aNo_1B@cVOul ; "NO.1  夢は時空を越えて " dd aNo_2B@B@Select ; "NO.2     Selection " dd aNo_3Umx ; "NO.3 東方妖恋談 " @@ -4777,6 +4779,8 @@ include th03/formats/cdg[data].asm dd aNo_19CRlvLxu ; "NO.19 霊人の休日 " dd aB@b@ ; "    " dd aB@b@vpvxvivf ; "   Quit " +public _MUSIC_FILES +_MUSIC_FILES label dword dd aOp_m_0 ; "op.m" dd aSelect_m_0 ; "select.m" dd a00mm_m ; "00mm.m" diff --git a/th04_op.asm b/th04_op.asm index 5c237fd0..47452989 100644 --- a/th04_op.asm +++ b/th04_op.asm @@ -2624,7 +2624,7 @@ arg_2 = byte ptr 6 mov ah, 0 shl ax, 2 mov bx, ax - pushd dword ptr [bx+0EB6h] + pushd _MUSIC_TITLES[bx] call graph_putsa_fx graph_accesspage byte ptr word_12DBC+1 push 10h @@ -2640,7 +2640,7 @@ arg_2 = byte ptr 6 mov ah, 0 shl ax, 2 mov bx, ax - pushd dword ptr [bx+0EB6h] + pushd _MUSIC_TITLES[bx] call graph_putsa_fx leave retn 4 @@ -3039,7 +3039,7 @@ loc_C4E4: mov ah, 0 shl ax, 2 mov bx, ax - call snd_load pascal, dword ptr [bx+0F16h], SND_LOAD_SONG + call snd_load pascal, dword ptr _MUSIC_FILES[bx], SND_LOAD_SONG kajacall KAJA_SONG_PLAY loc_C51D: @@ -5857,6 +5857,8 @@ aZun02_bft db 'zun02.bft',0 aZun04_bft db 'zun04.bft',0 aZun01_bft db 'zun01.bft',0 aZun03_bft db 'zun03.bft',0 +public _MUSIC_TITLES +_MUSIC_TITLES label dword dd aNo_1MSzlBLotus ; "No.1 幻想郷 〜 Lotus Land Story" dd aNo_2WitchingDr ; "No.2 Witching Dream " dd aNo_3SeleneSLig ; "No.3 Selene's light " @@ -5881,6 +5883,8 @@ aZun03_bft db 'zun03.bft',0 dd aNo_22MSzvPzrl ; "No.22 幻想の住人 " dd asc_105B2 ; " " dd aB@b@vpvxvivf ; "   Quit " +public _MUSIC_FILES +_MUSIC_FILES label dword dd aOp_2 ; "op" dd aSt00 ; "st00" dd aSt10 ; "st10" diff --git a/th05_op.asm b/th05_op.asm index 21800c54..35701f55 100644 --- a/th05_op.asm +++ b/th05_op.asm @@ -2965,8 +2965,8 @@ loc_BF14: mov ah, 0 shl ax, 2 add bx, ax - mov ax, [bx+0FF0h] - mov dx, [bx+0FEEh] + mov ax, word ptr _MUSIC_TITLES+2[bx] + mov dx, word ptr _MUSIC_TITLES[bx] mov [bp+var_2], ax mov [bp+var_4], dx add si, 60h @@ -3336,7 +3336,7 @@ var_1 = byte ptr -1 mov byte ptr word_13E94, 0 mov bx, music_game add bx, bx - mov ax, [bx+14A0h] + mov ax, MUSICROOM_TRACKCOUNTS[bx] mov musicroom_trackcount, ax mov byte_13E96, 0 call cdg_freeall @@ -3514,7 +3514,7 @@ loc_C698: mov word_1403A, 0 mov bx, music_game add bx, bx - mov ax, [bx+14A0h] + mov ax, MUSICROOM_TRACKCOUNTS[bx] mov musicroom_trackcount, ax push 0 call sub_C441 @@ -3522,7 +3522,7 @@ loc_C698: call sub_C3F9 pascal, 0 mov bx, music_game imul bx, 78h - call snd_load pascal, dword ptr [bx+1246h], SND_LOAD_SONG + call snd_load pascal, dword ptr _MUSIC_FILES[bx], SND_LOAD_SONG kajacall KAJA_SONG_PLAY loc_C6E3: @@ -3564,7 +3564,7 @@ loc_C6F1: mov ah, 0 shl ax, 2 add bx, ax - call snd_load pascal, dword ptr [bx+1246h], SND_LOAD_SONG + call snd_load pascal, dword ptr _MUSIC_FILES[bx], SND_LOAD_SONG kajacall KAJA_SONG_PLAY loc_C767: @@ -5736,6 +5736,8 @@ MUSICROOM_GAME dd aMUSICROOM_TH01 dd aMUSICROOM_TH03 dd aMUSICROOM_TH04 dd aMUSICROOM_TH05 +public _MUSIC_TITLES +_MUSIC_TITLES label dword dd aTH01_01 ; "No.1 A Sacred Lot " dd aTH01_02 ; "No.2 永遠の巫女 " dd aTH01_03 ; "No.3 The Positive and Negative " @@ -5886,6 +5888,8 @@ MUSICROOM_GAME dd aMUSICROOM_TH01 dd 0 dd 0 dd 0 +public _MUSIC_FILES +_MUSIC_FILES label dword dd aR_00 ; "r_00" dd aR_01 ; "r_01" dd aR_02 ; "r_02"