diff options
author | easyaspi314 (Devin) <easyaspi314@users.noreply.github.com> | 2019-08-23 20:44:01 -0400 |
---|---|---|
committer | easyaspi314 (Devin) <easyaspi314@users.noreply.github.com> | 2019-08-23 20:44:01 -0400 |
commit | a631973b73977f33ef98042abca9fca287792439 (patch) | |
tree | 5418525ee00fbfaa046adecfb3d328c4c00e02d7 /data | |
parent | bc159dbb03735db55e6a09bb7947dccc70d0532b (diff) |
[WIP] English Debug menu translations! (Plus some build system fixes)
I'm back!
す
Éß テ-ブ↑& ÒÛªù! (かなテーブルを捨てろよ!/Throw away the kana table!)
When compiled in English with DEBUG, instead of óじばÌ (mojibake),
you now get actual English translations!
No more switching from the game, to the kana chart, and if you don't know
Japanese, Google Translate, just to read one sentence.
Additionally, the few unknown translations should use proper encoding or
Romaji.
I decided to use a nicer macro system:
static const u8 sStrHello[] = DTR("こんにちは", "Hello");
This prevents ifdef HELL, as the mixed Japanese and English would
be messy.
Additionally, some special character issues were corrected.
Things untranslated/bugs:
- Tomomichi's dummy functions. Of course, they don't do much.
- The title screen battle menu. This uses a Gen 2 style tile rendering
and the way it is rendered is incredibly overcomplicated.
- A few phrases which I couldn't get a clear translation for. I don't know
much Japanese lol.
- Song names. Just tedious with the limited buffer size.
- A few layout issues. Some dimensions should be tweaked to avoid text
box ovetflows.
- Potential buffer overflows, which I want to try to avoid
- (ASan for GBA? :morphon:)
- While I use the DEBUG_TRANSLATE flag (automatic with ENGLISH && DEBUG)
for C code, the asm data only checks for ENGLISH && DEBUG. Additionally,
they are ugly.
- Haven't tested all builds yet.
- Some code formatting issues.
I also made it so this will compile with the system preprocessor (including
Clang), and my agbcc binutils (which will attempt to be selected automatically
if you don't have DKP).
Clang needs a few flags (it can't do asm enums with line numbers and it does
trigraphs in standard mode), but it is no longer flipping out.
I am going to restart my build system project. It was getting way off track,
and ucpp was too difficult to maintain (one of the main reasons for the silence).
Diffstat (limited to 'data')
-rw-r--r-- | data/btl_attrs.s | 57 | ||||
-rw-r--r-- | data/debug_mystery_event_scripts.s | 73 | ||||
-rw-r--r-- | data/pokemon_storage_system.s | 5 |
3 files changed, 128 insertions, 7 deletions
diff --git a/data/btl_attrs.s b/data/btl_attrs.s index dc1d5b7ff..11c50e2ba 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -66,7 +66,7 @@ UnkDebug0:: @ 0x821F3B8 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - +@ Title battle menu window positions gUnknown_Debug_821F424:: .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x9b, 0x01, 0x01, 0x00, 0x12, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x64, 0x00, 0x01, 0x00, 0x18, 0x00, 0x0e, 0x00, 0x02, 0x00, 0x5c, 0x01, 0x00, 0x00, 0x2e, 0x00 .byte 0x1a, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x30, 0x00, 0x1c, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x34, 0x00, 0x01, 0x00, 0x04, 0x00, 0x9b, 0x01, 0x00, 0x00, 0x44, 0x00, 0x0a, 0x00 @@ -105,8 +105,41 @@ gUnknown_Debug_821F5AC:: Str_821F624:: @ 0x821F624 .string "ーーーーーーーーーーーー$" +.if ENGLISH str_821F631:: @ 0x821F631 + .string "JUNICHI$" + .string "STEVEN LOW$" + .string "VALENCIA$" + .string "HARUKOMACHI$" + +Str_821F649:: @ 0x821F649 + .string "TETSUJI$" + +debug_unk_0b:: +@ 0x821F64D + .string " ON$" + +@ 0x821F652 + .string "OFF$" + +@ 0x821F655 + .string "MONO$" + +@ 0x821F65A + .string "STEREO$" + +@ 0x821F65F + .string "TEST$" + +@ 0x821F665 + .string "Received$" + +@ 0x821F66D + .string "Connection error$" + +.else +str_821F631:: @ 0x821F631 .string "ジュンイチ$" .string "ダイゴロウ$" .string "バレンシア$" @@ -137,9 +170,11 @@ debug_unk_0b:: @ 0x821F66D .string "せつぞくエラー$" +.endif + @ 0x821f675 .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 - +@ Debug battle menu curspr positions gUnknown_Debug_821F680:: .byte 0xc0, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0xda, 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x00, 0xf6, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x52, 0x01, 0x00, 0x00, 0x5a, 0x01, 0x00, 0x00 .byte 0x72, 0x01, 0x00, 0x00, 0x76, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xd2, 0x01, 0x00, 0x00, 0xda, 0x01, 0x00, 0x00, 0xf2, 0x01, 0x00, 0x00, 0xf6, 0x01, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00 @@ -153,6 +188,22 @@ gUnknown_Debug_821F680:: gUnknown_Debug_821F798:: .byte 0xc0, 0x03, 0x00, 0x00, 0xd6, 0x03, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x56, 0x04, 0x00, 0x00, 0xc0, 0x0b, 0x00, 0x00, 0xd6, 0x0b, 0x00, 0x00, 0x40, 0x0c, 0x00, 0x00, 0x56, 0x0c, 0x00, 0x00 +.if ENGLISH +Str_821F7B8:: @ 0x821F7B8 + .string "HEIGHT$" + +Str_821F7BD:: @ 0x821F7BD + .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}YOUR HEIGHT\n" + .string "POKéMON FILE$" + +Str_821F7DA:: @ 0x821F7DA + .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}LOAD\n" + .string "SAVE$" + +Str_821F7EA:: @ 0x821F7EA + .string "Would you like to load?$" + +.else Str_821F7B8:: @ 0x821F7B8 .string "たかさ $" @@ -167,11 +218,11 @@ Str_821F7DA:: @ 0x821F7DA Str_821F7EA:: @ 0x821F7EA .string "ロードしますか?$" +.endif @ 0x821F7F3 gUnknown_Debug_821F7F3:: .string "セーブしますか?$" - .endif .align 2 diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s index 1d29998ef..9a08941c3 100644 --- a/data/debug_mystery_event_scripts.s +++ b/data/debug_mystery_event_scripts.s @@ -26,10 +26,15 @@ _0845DAFF: me_runscript _0845DD0D me_end +.if ENGLISH +_0845DB16: + .string "Run and visit your DAD in the\n" + .string "PETALBURG CITY GYM.$" +.else _0845DB16: .string "Lauf und besuche deinen Vater in der\n" .string "ARENA von BLÜTENBURG CITY.$" - +.endif _845DB56: setvaddress _845DB56 checkitem ITEM_EON_TICKET, 0x1 @@ -65,10 +70,25 @@ _0845DBB5: release end +.if ENGLISH +_0845DBBE: + .string "DAD: {PLAYER}! Nice to see you!\n" + .string "Here is a Letter for you, {PLAYER}.$" +_0845DC00: + .string "DAD: I'm not sure. It could be a\n" + .string "TICKET for a Ferry.\p" + .string "You should go to LILYCOVE CITY and\n" + .string "ask about it there.$" + +_0845DC94: + .string "DAD: {PLAYER}, the KEY ITEMS pocket\n" + .string "in your BAG is full.\p" + .string "Store some of your KEY ITEMS in\n" + .string "the PC and come back later.$" +.else _0845DBBE: .string "VATER: {PLAYER}! Schön, dich zu sehen!\n" .string "Hier ist ein Brief für dich, {PLAYER}.$" - _0845DC00: .string "VATER: Ich bin mir nicht sicher, es\n" .string "könnte ein TICKET für eine Fähre sein.\p" @@ -80,6 +100,8 @@ _0845DC94: .string "deines BEUTELS ist voll.\p" .string "Lagere einige deiner Basis-Items in\n" .string "deinem PC und komm dann wieder.$" +.endif + _845DB56End: .size _845DB56, _845DB56End - _845DB56 @@ -110,12 +132,20 @@ _0845DD5B: setmysteryeventstatus 0x3 end +.if ENGLISH +_0845DD63: + .string "This GIFT can only be used\n" + .string "once.$" +_0845DD95: + .string "The KEY ITEMS pocket is full.$" +.else _0845DD63: .string "Dieses GESCHEHEN kann nur einmal\n" .string "gespielt werden.$" - _0845DD95: - .string "Deine BASIS-TASCHE ist voll.$" + .string "Deine BASIS-TASCHE ist voll.$" +.endif + _0845DAFFEnd: .size _0845DAFF, _0845DAFFEnd - _0845DAFF gUnknown_Debug_845DAE1End:: @@ -153,6 +183,16 @@ _0845E34C: setmysteryeventstatus 0x3 end +.if ENGLISH +_0845E34F: + .string "A POKéMON was added to the {PLAYER}'s\n" + .string "team.$" + +_0845E387: + .string "Your team is full.\n" + .string "No more POKéMON can be added to your\l" + .string "team.$" +.else _0845E34F: .string "Ein POKéMON wurde in das Team des\n" .string "Spielers aufgenommen.$" @@ -161,6 +201,7 @@ _0845E387: .string "Das Team des Spielers ist vollständig.\n" .string "Es kann kein weiteres POKéMON\l" .string "aufgenommen werden.$" +.endif gUnknown_Debug_845E3E0:: me_checkcompat gUnknown_Debug_845E3E0, 0x4, 0x4, 0x4, 0x80 @@ -232,9 +273,16 @@ _0845E637: me_setstatus 0x2 me_end +.if ENGLISH + +_0845E64C: + .string "Visit your DAD in the PETALBURG\n" + .string "CITY GYM.$" +.else _0845E64C: .string "Besuche deinen Vater in der ARENA\n" .string "von BLÜTENBURG CITY.$" +.endif _0845E683: setvaddress _0845E683 @@ -257,10 +305,18 @@ _0845E683: _0845E6BF: gotoram +.if ENGLISH +_0845E6C0: + .string "DAD: Hi, {PLAYER}!\p" + .string "I have just received this rare\n" + .string "BERRY. You can have it!$" +.else _0845E6C0: .string "VATER: Hi, {PLAYER}!\p" .string "Ich habe gerade diese seltene BEERE\n" .string "erhalten. Ich schenke sie dir!$" +.endif + _0845E637End: .size _0845E637, _0845E637End - _0845E637 _0845E683End: @@ -289,11 +345,20 @@ _0845E755: setmysteryeventstatus 0x3 end +.if ENGLISH +_0845E75D: + .string "{STR_VAR_1} was handed over.$" +_0845E771: + .string "There is no room for {STR_VAR_1}\n" + .string "available...$" +.else _0845E75D: .string "{STR_VAR_1} wurde übergeben.$" _0845E771: .string "Es ist kein Platz für {STR_VAR_1}\n" .string "vorhanden...$" +.endif + _0845E730End: .size _0845E730, _0845E730End - _0845E730 gUnknown_Debug_845E712End:: diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index ddb672e8e..7f65bb1d1 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -73,9 +73,14 @@ gSpriteTemplate_83BBC88:: @ 83BBC88 spr_template 1, 56006, gOamData_83BBC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_809CB74 .if DEBUG +.if ENGLISH +gUnknown_Debug_0x83E6268:: @ 0x83E6268 + .string "SET$" +.else gUnknown_Debug_0x83E6268:: @ 0x83E6268 .string "セットする$" .endif +.endif .align 2 gUnknown_083BBCA0:: @ 83BBCA0 |