Skip to content

Commit 6fe1d8a

Browse files
miniropminirop
committed
Improved decode.py + more strings found
1 parent d53c07e commit 6fe1d8a

9 files changed

Lines changed: 1110 additions & 1060 deletions

File tree

‎scripts/decode.py‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@
4444
'24': 'WOMAN',
4545
'25': 'BOY',
4646
'26': 'GIRL',
47-
'86': 'DUMA'
47+
'27': 'ZEKE',
48+
'2B': 'HALCYON',
49+
'86': 'JEDAH',
50+
'8D': 'MASSENA',
4851
}
4952

5053
dir_path = os.path.dirname(os.path.realpath(__file__))
@@ -68,7 +71,9 @@ def decode(code):
6871
c = code.split(' ')
6972
output = []
7073
in_string = False
71-
for cc in c:
74+
in_speak = False
75+
it = iter(c)
76+
for cc in it:
7277
match cc:
7378
case '0F':
7479
output[-1] = tenten[output[-1]]
@@ -79,6 +84,26 @@ def decode(code):
7984
in_string = True
8085
output += "ENCODE(\""
8186
output += ' '
87+
case 'E6' if in_speak:
88+
output += ".db $E6\n"
89+
case 'EA' if not in_speak:
90+
output += "SPEAK\n"
91+
case 'E8' if not in_speak:
92+
a = next(it)
93+
b = next(it)
94+
c = next(it)
95+
96+
if a == '50' and b == '40':
97+
output += "FACE "
98+
output += characters[c]
99+
else:
100+
output += f".db $E8 ${a} ${b} ${c}"
101+
output += "\n"
102+
case 'F0' if not in_speak:
103+
output += "NAME "
104+
value = next(it)
105+
output += characters[value]
106+
output += "\n"
82107
case _:
83108
if cc in mapping:
84109
if not in_string:
@@ -90,18 +115,14 @@ def decode(code):
90115
in_string = False
91116
output += "\")\n"
92117
match cc:
93-
case 'E6':
94-
output += ".db $E6\n"
95-
case 'EA':
96-
output += "SPEAK\n"
97118
case 'ED':
98119
output += "NEWLINE\n"
99120
case 'EE':
100121
output += "WAIT_CLICK\n"
101122
case 'EF':
102123
output += "STOP\n"
103124
case _:
104-
output += f" ${cc}"
125+
output += f".db ${cc}\n"
105126

106127
if in_string:
107128
output += "\")"

‎src/bank001.asm.inc‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,21 +1502,8 @@ L01A1BC:
15021502
.db $26 $27 $28 $25
15031503

15041504
L01A1C0:
1505-
.db $33
1506-
.db $34
1507-
.db $35
1508-
.db $36
1509-
.db $37
1510-
.db $38
1511-
.db $39
1512-
.db $3A
1513-
.db $3B
1514-
.db $3C
1515-
.db $3D
1516-
.db $3E
1517-
.db $3F
1518-
.db $40
1519-
.db $32
1505+
.db $33 $34 $35 $36 $37 $38 $39 $3A
1506+
.db $3B $3C $3D $3E $3F $40 $32
15201507

15211508
L01A1CF:
15221509
.dw L01A253

‎src/bank003.asm.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,8 +3667,8 @@ ENCODE("でるから きをつけろよ")
36673667
STOP
36683668

36693669
L039C9A:
3670-
FACE DUMA
3671-
NAME DUMA
3670+
FACE JEDAH
3671+
NAME JEDAH
36723672
SPEAK
36733673
ENCODE("ふふ ソフィアのおうじょか")
36743674
NEWLINE
@@ -3679,7 +3679,7 @@ NAME CELICA
36793679
SPEAK
36803680
ENCODE("あなたは だれ!?")
36813681
PAGE
3682-
NAME DUMA
3682+
NAME JEDAH
36833683
SPEAK
36843684
ENCODE("わしか")
36853685
NEWLINE
@@ -3704,7 +3704,7 @@ ENCODE("だいちぼしんミラを")
37043704
NEWLINE
37053705
ENCODE("もとにもどしてください!!")
37063706
PAGE
3707-
NAME DUMA
3707+
NAME JEDAH
37083708
SPEAK
37093709
ENCODE("ふふふ···")
37103710
NEWLINE

‎src/bank004.asm.inc‎

Lines changed: 28 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -2693,44 +2693,11 @@ L04A079:
26932693
.db $0F
26942694

26952695
L04A0C2:
2696-
.db $0F
2697-
.db $20
2698-
.db $10
2699-
.db $00
2700-
.db $0F
2701-
.db $37
2702-
.db $28
2703-
.db $18
2704-
.db $0F
2705-
.db $35
2706-
.db $25
2707-
.db $15
2708-
.db $0F
2709-
.db $37
2710-
.db $28
2711-
.db $18
2712-
.db $00
2713-
.db $3F
2714-
.db $10
2715-
.db $10
2716-
.db $0F
2717-
.db $20
2718-
.db $10
2719-
.db $00
2720-
.db $0F
2721-
.db $37
2722-
.db $28
2723-
.db $18
2724-
.db $0F
2725-
.db $35
2726-
.db $25
2727-
.db $15
2728-
.db $0F
2729-
.db $37
2730-
.db $28
2731-
.db $18
2732-
.db $00
2733-
2696+
.db $0F $20 $10 $00 $0F $37 $28 $18
2697+
.db $0F $35 $25 $15 $0F $37 $28 $18
2698+
.db $00 $3F $10 $10 $0F $20 $10 $00
2699+
.db $0F $37 $28 $18 $0F $35 $25 $15
2700+
.db $0F $37 $28 $18 $00
27342701

27352702
ENCODE("かつて このちじょうに")
27362703
NEWLINE
@@ -2977,19 +2944,8 @@ L04A482:
29772944
RTS
29782945

29792946
L04A48D:
2980-
.db $C8
2981-
.db $C7
2982-
.db $C6
2983-
.db $C3
2984-
.db $BF
2985-
.db $BE
2986-
.db $B8
2987-
.db $B0
2988-
.db $A0
2989-
.db $80
2990-
.db $48
2991-
.db $08
2992-
.db $00
2947+
.db $C8 $C7 $C6 $C3 $BF $BE $B8 $B0
2948+
.db $A0 $80 $48 $08 $00
29932949

29942950
L04A49A:
29952951
JSR L0FC288.w
@@ -5493,88 +5449,27 @@ L04B619:
54935449
.db $7B
54945450

54955451
L04B62A:
5496-
.db $11
5497-
.db $08
5498-
.db $95
5499-
.db $00
5500-
.db $00
5501-
.db $10
5502-
.db $B8
5503-
.db $00
5504-
.db $08
5505-
.db $10
5506-
.db $B7
5507-
.db $00
5508-
.db $00
5509-
.db $10
5510-
.db $C6
5511-
.db $00
5512-
.db $28
5513-
.db $10
5514-
.db $C5
5515-
.db $00
5516-
.db $20
5517-
.db $10
5518-
.db $C4
5519-
.db $00
5520-
.db $18
5521-
.db $10
5522-
.db $C3
5523-
.db $00
5524-
.db $10
5525-
.db $08
5526-
.db $B6
5527-
.db $00
5528-
.db $28
5529-
.db $08
5530-
.db $B5
5531-
.db $00
5532-
.db $20
5533-
.db $08
5534-
.db $B4
5535-
.db $00
5536-
.db $18
5537-
.db $08
5538-
.db $B3
5539-
.db $00
5540-
.db $10
5541-
.db $08
5542-
.db $B2
5543-
.db $00
5544-
.db $08
5545-
.db $00
5546-
.db $B1
5547-
.db $00
5548-
.db $18
5549-
.db $00
5550-
.db $B0
5551-
.db $00
5552-
.db $10
5553-
.db $F8
5554-
.db $94
5555-
.db $00
5556-
.db $10
5557-
.db $F8
5558-
.db $92
5559-
.db $00
5560-
.db $08
5561-
.db $F8
5562-
.db $91
5563-
.db $00
5564-
.db $00
5565-
.db $B9
5566-
.db $61
5567-
.db $69
5568-
.db $69
5569-
.db $61
5570-
.db $FF
5571-
.db $A0
5572-
.db $A1
5573-
.db $A2
5574-
.db $A3
5575-
.db $A4
5576-
.db $A5
5577-
.db $EF
5452+
.db $11 $08
5453+
.db $95 $00 $00 $10
5454+
.db $B8 $00 $08 $10
5455+
.db $B7 $00 $00 $10
5456+
.db $C6 $00 $28 $10
5457+
.db $C5 $00 $20 $10
5458+
.db $C4 $00 $18 $10
5459+
.db $C3 $00 $10 $08
5460+
.db $B6 $00 $28 $08
5461+
.db $B5 $00 $20 $08
5462+
.db $B4 $00 $18 $08
5463+
.db $B3 $00 $10 $08
5464+
.db $B2 $00 $08 $00
5465+
.db $B1 $00 $18 $00
5466+
.db $B0 $00 $10
5467+
.db $F8 $94 $00 $10
5468+
.db $F8 $92 $00 $08
5469+
.db $F8 $91 $00 $00
5470+
ENCODE("©1991 ")
5471+
NINTENDO
5472+
STOP
55785473

55795474
L04B67C:
55805475
ENCODE("かくして")

‎src/bank007.asm.inc‎

Lines changed: 8 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,70 +2001,14 @@ L079026:
20012001
.db $CB
20022002

20032003
L0790F6:
2004-
.db $CB
2005-
.db $CB
2006-
.db $CB
2007-
.db $CB
2008-
.db $CB
2009-
.db $D5
2010-
.db $DA
2011-
.db $DA
2012-
.db $8B
2013-
.db $ED
2014-
.db $C2
2015-
.db $C2
2016-
.db $C2
2017-
.db $C2
2018-
.db $C2
2019-
.db $C2
2020-
.db $41
2021-
.db $71
2022-
.db $40
2023-
.db $C2
2024-
.db $C2
2025-
.db $C2
2026-
.db $8B
2027-
.db $DA
2028-
.db $DA
2029-
.db $DA
2030-
.db $DA
2031-
.db $DA
2032-
.db $CB
2033-
.db $CB
2034-
.db $CB
2035-
.db $CB
2036-
.db $CB
2037-
.db $CB
2038-
.db $CB
2039-
.db $CB
2040-
.db $D3
2041-
.db $C2
2042-
.db $C2
2043-
.db $C2
2044-
.db $9B
2045-
.db $88
2046-
.db $89
2047-
.db $76
2048-
.db $78
2049-
.db $78
2050-
.db $79
2051-
.db $C2
2052-
.db $C2
2053-
.db $C2
2054-
.db $C2
2055-
.db $C2
2056-
.db $C2
2057-
.db $8C
2058-
.db $8D
2059-
.db $E2
2060-
.db $37
2061-
.db $E4
2062-
.db $37
2063-
.db $E3
2064-
.db $D2
2065-
.db $D5
2066-
.db $CB
2067-
.db $CB
2004+
.db $CB $CB $CB $CB $CB $D5 $DA $DA
2005+
.db $8B $ED $C2 $C2 $C2 $C2 $C2 $C2
2006+
.db $41 $71 $40 $C2 $C2 $C2 $8B $DA
2007+
.db $DA $DA $DA $DA $CB $CB $CB $CB
2008+
.db $CB $CB $CB $CB $D3 $C2 $C2 $C2
2009+
.db $9B $88 $89 $76 $78 $78 $79 $C2
2010+
.db $C2 $C2 $C2 $C2 $C2 $8C $8D $E2
2011+
.db $37 $E4 $37 $E3 $D2 $D5 $CB $CB
20682012

20692013
L079136:
20702014
JSR L0FD39A.w

‎src/bank008.asm.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1647,7 +1647,7 @@ L089262:
16471647
.db $05 $04 $00 $00
16481648

16491649
L08926E:
1650-
.db ZEKE GOLD_KNIGHT $03 $28 $00 $14 $0D $0E
1650+
.db ZEKE_UNIT GOLD_KNIGHT $03 $28 $00 $14 $0D $0E
16511651
.db $04 $0E $00 $00
16521652

16531653
.db $00 ; terminator?

0 commit comments

Comments
 (0)