Skip to content

Commit

Permalink
Поправки
Browse files Browse the repository at this point in the history
  • Loading branch information
MAGNAT2645 committed May 13, 2020
1 parent 83e7dd3 commit 5e62842
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/Tools/input.txt
/Tools/output.txt
/Tools/CoilSnake_4.0.exe
/MSU-1/*
/MSU-1/*
.ips
Binary file removed EarthBoundRUS.ips
Binary file not shown.
8 changes: 4 additions & 4 deletions Source/ccscript/data_02.ccs
Original file line number Diff line number Diff line change
Expand Up @@ -568,13 +568,13 @@ l_0xc536e1:
l_0xc53711:
/*
" <Медаль Франклина>" next
"@Храня её как один из ваших предметов," next
"@способна отражать атаку молнией обратно в атакующего." end
"@Находясь в инвентаре," next
"@способна отражать вражеские молнии." end
*/
newline
" <[7E][96][95][91][9D][C3] [86][A2][91][9F][9C][9D][9A][9F][91]>" next
"@[87][A2][91][9F][C6] [96][97] [9C][91][9C] [A0][95][9A][9F] [9A][99] [93][91][AA][9A][A7] [A1][A2][96][95][9E][96][A4][A0][93]," next
"@[A3][A1][A0][A3][A0][92][9F][91] [A0][A4][A2][91][98][91][A4][C3] [91][A4][91][9C][A5] [9E][A0][9D][9F][9A][96][9B] [A0][92][A2][91][A4][9F][A0] [93] [91][A4][91][9C][A5][C5][C0][96][94][A0]." end
"@[7F][91][A7][A0][95][C6][A3][C3] [93] [9A][9F][93][96][9F][A4][91][A2][96]," next
"@[A3][A1][A0][A3][A0][92][9F][91] [A0][A4][A2][91][98][91][A4][C3] [93][A2][91][98][96][A3][9C][9A][96] [9E][A0][9D][9F][9A][9A]." end

l_0xc53750:
// "@Милый плюшевый мишка!" end
Expand Down
3 changes: 1 addition & 2 deletions Source/ccscript/data_03.ccs
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,8 @@ l_0xc54842:
call(data_05.l_0xc56d63) end

l_0xc54852:
// " <Сахарный пакетик>" next
newline
" <[83][91][A7][91][A2][9F][C2][9B] [A1][91][9C][96][A4][9A][9C]>" next
" <1C 05 77>" next
call(data_05.l_0xc56d63) end

l_0xc54862:
Expand Down
10 changes: 7 additions & 3 deletions Source/ccscript/data_04.ccs
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,9 @@ l_0xc55915:
call(data_05.l_0xc56cb5) "25" call(data_05.l_0xc56cd6) end

l_0xc5592c:
// " <Энергетический батончик>" next
newline
" <[1C 05 BF]>" next
" <[B4][9F][96][A2][94][96][A4][9A][A9][96][A3][9C][9A][9B] [92][91][A4][A0][9F][A9][9A][9C]>" next
call(data_05.l_0xc56cb5) "60" call(data_05.l_0xc56cd6) end

l_0xc55943:
Expand Down Expand Up @@ -627,9 +628,12 @@ l_0xc55b21:
"@[B4][A4][A0] [A0][A9][96][9F][C3] [A5][9E][9F][91][C6] [9E][C2][AA][C3]." end

l_0xc55b79:
// "@Мороженое, модное среди молодых женщин." next
/*
" <Курортный Джелато>" next
"@Мороженое, модное среди молодых женщин." next
*/
newline
" <[1C 05 C6]>" next
" <[7C][A5][A2][A0][A2][A4][9F][C2][9B] [75][98][96][9D][91][A4][A0]>" next
"@[7E][A0][A2][A0][98][96][9F][A0][96], [9E][A0][95][9F][A0][96] [A3][A2][96][95][9A] [9E][A0][9D][A0][95][C2][A7] [98][96][9F][C0][9A][9F]." next
call(data_05.l_0xc56cb5) "30" call(data_05.l_0xc56cd6) end

Expand Down
3 changes: 2 additions & 1 deletion Source/ccscript/data_05.ccs
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ l_0xc562dd:

l_0xc5630a:
/*
" <Фасолевый крокет>" next
"@Крокет приготовлен с пюре из родной для Скарабы фасоли, затем панирован и сильно прожарен." next
"@Он вкусный и солёный, а старое масло делает его ещё вкуснее." next
*/
newline
" <[1C 05 ED]>" next
" <[86][91][A3][A0][9D][96][93][C2][9B] [9C][A2][A0][9C][96][A4]>" next
"@[7C][A2][A0][9C][96][A4] [A1][A2][9A][94][A0][A4][A0][93][9D][96][9F] [A3] [A1][C5][A2][96] [9A][99] [A2][A0][95][9F][A0][9B] [95][9D][C6] [83][9C][91][A2][91][92][C2] [A6][91][A3][A0][9D][9A], [99][91][A4][96][9E] [A1][91][9F][9A][A2][A0][93][91][9F] [9A] [A3][9A][9D][C3][9F][A0] [A1][A2][A0][98][91][A2][96][9F]." next
"@[80][9F] [93][9C][A5][A3][9F][C2][9B] [9A] [A3][A0][9D][97][9F][C2][9B], [91] [A3][A4][91][A2][A0][96] [9E][91][A3][9D][A0] [95][96][9D][91][96][A4] [96][94][A0] [96][C0][97] [93][9C][A5][A3][9F][96][96]." next
call(l_0xc56cb5) "40" call(l_0xc56cd6) end
Expand Down
4 changes: 2 additions & 2 deletions Source/ccscript/data_06.ccs
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ l_0xc58369:
"[02][19 02]"
"[7D][91][A3][A4][9A][9C]" // "Ластик"
"[02][19 02]"
"[7E]. [86][A2][91][9F][9C][9D][9A][9F][91]" // "М. Франклина"
"[7E][96][95].[90][86][A2][91][9F][9C][9D][9A][9F][91]" // "Мед.[90]Франклина"
"[02][19 02]"
"[7C][9D][C5][A9] [A0][A4] [9C][91][92][9A][9F][C2]" // "Ключ от кабины"
"[02][19 02]"
Expand All @@ -824,7 +824,7 @@ l_0xc58369:
"[02][19 02]"
"[7C][A5][A3][A0][9C] [9E][96][A4][96][A0][A2][9A][A4][91]" // "Кусок метеорита"
"[02][19 02]"
"[81][A0][95][A1][9A][A3][91][9F][9F]. [92][91][9F][91][9F]" // "Подписанн. банан"
"[81][A0][95][A1][9A][A3][91][9F]. [92][91][9F][91][9F]" // "Подписан. банан"
"[02][19 02]"
"[7D][91][A3][A4]. [A0][A4] [9D][91][A3][A4][9A][9C][A0][93]" // "Ласт. от ластиков"
"[02][19 02]"
Expand Down
20 changes: 10 additions & 10 deletions Source/item_configuration_table.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- ness can use
- paula can use
- poo can use
Name: "М.[90]Франклина"
Name: "Мед.[90]Франклина"
Type: 0
2:
Action: 1
Expand Down Expand Up @@ -1106,7 +1106,7 @@
- ness can use
- paula can use
- poo can use
Name: "Шляпа[90]Холмс"
Name: "Шляпа[90]Холмса"
Type: 28
76:
Action: 240
Expand Down Expand Up @@ -1829,7 +1829,7 @@
- ness can use
- paula can use
- poo can use
Name: "Сахарн.[90]пакетик"
Name: "Пакетик[90]сахара"
Type: 40
120:
Action: 249
Expand Down Expand Up @@ -2135,7 +2135,7 @@
Help Text Pointer: data_04.l_0xc54c6d
Misc Flags:
- jeff can use
Name: "Раздатч.[90]йогурта"
Name: "Раздатч.[90]тофу"
Type: 52
140:
Action: 186
Expand Down Expand Up @@ -2572,7 +2572,7 @@
- ness can use
- paula can use
- poo can use
Name: "Королевск.[90]банан"
Name: "Королев.[90]банан"
Type: 56
167:
Action: 288
Expand Down Expand Up @@ -2950,7 +2950,7 @@
- ness can use
- paula can use
- poo can use
Name: "Клубн.[90]тофу"
Name: "Клубнич.[90]тофу"
Type: 32
190:
Action: 249
Expand Down Expand Up @@ -2984,7 +2984,7 @@
- ness can use
- paula can use
- poo can use
Name: "Хлебная[90]палочка"
Name: "Энерг.[90]батончик"
Type: 32
192:
Action: 1
Expand Down Expand Up @@ -3096,7 +3096,7 @@
- ness can use
- paula can use
- poo can use
Name: "Джелато[90]дэ[90]курорт"
Name: "Курорт.[90]Джелато"
Type: 32
199:
Action: 268
Expand Down Expand Up @@ -3178,7 +3178,7 @@
- ness can use
- paula can use
- poo can use
Name: "Видео[90]релаксант"
Name: "Видео-наркотик"
Type: 56
204:
Action: 281
Expand Down Expand Up @@ -3718,7 +3718,7 @@
- ness can use
- paula can use
- poo can use
Name: "Фасолевый[90]крокет"
Name: "Фасолев.[90]крокет"
Type: 32
238:
Action: 249
Expand Down

0 comments on commit 5e62842

Please sign in to comment.