Commit Graph

4817 Commits

Author SHA1 Message Date
GriffinR
535576adae Set compare flag in config 2019-10-16 17:49:09 -04:00
GriffinR
e215a4b2f8 Update Travis to use compare 2019-10-16 17:36:08 -04:00
GriffinR
a116f4e94c Sync compare behavior with pokeemerald 2019-10-16 17:22:29 -04:00
PikalaxALT
2126668f09 Match sub_80C9720 2019-10-05 09:56:57 -05:00
PikalaxALT
27070e42f3 Merge pull request #757 from easyaspi314/debug-english
English Debug menu translations!
2019-10-02 12:01:45 -04:00
PikalaxALT
99e6a6639e Merge branch 'master' into debug-english 2019-10-02 11:50:17 -04:00
PikalaxALT
1bd678656c Merge pull request #743 from garakmon/metatile_labels
Name Metatiles
2019-09-08 12:43:57 -04:00
PikalaxALT
00fef26c52 Merge pull request #744 from garakmon/pokenav-data
Pokenav Data Decomp (take 2)
2019-09-08 12:41:48 -04:00
PikalaxALT
1d9088d2a8 Merge pull request #753 from ultima-soul/synchronize
Synchronize bard_music data organization with pokeemerald
2019-09-08 12:40:12 -04:00
PikalaxALT
c33effb95c Configure Travis to build nonmatching (#746)
* Configure Travis to build nonmatching
2019-09-05 16:03:17 -04:00
easyaspi314 (Devin)
dcd7c8a241 Fix a mixup in the naming :( 2019-09-05 14:28:56 -04:00
easyaspi314 (Devin)
5829e033ee Revert Makefile changes [for now] to avoid conflict with PikalaxALT:modern_gcc 2019-09-05 13:42:24 -04:00
easyaspi314 (Devin)
3203e4f2f4 Document some debug menu things 2019-09-05 13:37:38 -04:00
PikalaxALT
082093aa36 Merge pull request #755 from garakmon/encounter_json
Wild Encounters to Json
2019-09-05 10:47:39 -04:00
PikalaxALT
f89f80daec Merge pull request #760 from PikalaxALT/match_current
Match sub_80D6874
2019-09-05 09:17:08 -04:00
Scott Norton
7a54497761 Match sub_80D6874 2019-08-30 14:22:02 -04:00
garak
0e8ccfc4fd name event object pointer indices 2019-08-29 16:38:23 -05:00
garak
06af013e50 allow CRLF line endings in asm files for preproc 2019-08-29 16:37:58 -05:00
easyaspi314 (Devin)
98d87b1a47 Make DEBUG_TRANSLATE a makefile flag 2019-08-27 00:34:24 -04:00
easyaspi314 (Devin)
6eafbcabf3 Change data debug translations to use DEBUG_TRANSLATE
I'd prefer a macro, but preproc currently comes first.
2019-08-26 21:08:41 -04:00
easyaspi314 (Devin)
8f1e63cbcd Mark some things in tomomichi_debug_menu.c 2019-08-26 19:27:24 -04:00
easyaspi314 (Devin)
abc82feda6 Translate skipped Mail text 2019-08-26 12:56:57 -04:00
easyaspi314 (Devin)
973f010c41 Translate the Trainer card test name 2019-08-26 12:56:08 -04:00
easyaspi314 (Devin)
79a40cb610 Improve slot machine translation, make textbox larger 2019-08-26 12:55:32 -04:00
easyaspi314 (Devin)
0934066d11 Fix some test menu translations, document unused functions and name stuff 2019-08-25 22:54:45 -04:00
easyaspi314 (Devin)
5d1f39aa6f Improve a mori_debug_menu translation 2019-08-25 21:07:42 -04:00
easyaspi314 (Devin)
b19c77d1c9 Replace asm("") with ++ --.
agbcc is weird
2019-08-25 21:06:57 -04:00
easyaspi314 (Devin)
f97cff8748 Improve some nohara translations. 2019-08-25 19:23:42 -04:00
easyaspi314 (Devin)
1c0ccca5a2 Match and document DebugMenu_8077C3C (now DebugMenu_ConvertBuildDate)
It seems that simply putting an asm("") matched 8077C3C.
2019-08-24 23:17:06 -04:00
easyaspi314 (Devin)
265fd20253 Rename old_charmap and move from graphics-de/unused to graphics/debug.
The debug battle text is in English on German ROMs and Japanese on English
ROMs. Additionally, old_charmap.bin held the actual text. Weird.

I also choose the English when DEBUG_TRANSLATE is on.
2019-08-24 16:35:52 -04:00
easyaspi314 (Devin)
2c42658d87 Beware the BRENDAN 2019-08-24 11:49:18 -04:00
easyaspi314 (Devin)
532e6397d5 .if ENGLISH != .ifdef ENGLISH 2019-08-24 00:11:41 -04:00
easyaspi314 (Devin)
a631973b73 [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).
2019-08-23 20:44:01 -04:00
garak
d4dc5c755a use encounter slot constants, fix some gfx 2019-08-01 22:25:09 -04:00
garak
ca6b89f5ff fix build 2019-08-01 18:59:29 -04:00
garak
7f55a6ce86 revert makefile changes 2019-08-01 18:24:07 -04:00
garak
c73de8bed7 convert wild encounters to json 2019-08-01 18:13:42 -04:00
ultima-soul
dee6732764 Finish synchronizing bard_music data organization. 2019-07-31 00:01:20 -07:00
ultima-soul
9ee6622f83 Start bard_music synchronization. 2019-07-30 19:49:31 -07:00
Cameron Hall
bc159dbb03 Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
2019-07-30 21:31:27 -05:00
garak
02f4d3e420 add jsonproc tool 2019-07-30 16:20:20 -04:00
camthesaxman
cf0da4c3bb fix build 2019-07-29 21:25:10 -05:00
camthesaxman
ea0dfce3c4 gMPlay to gMPlayInfo 2019-07-29 21:17:54 -05:00
camthesaxman
db4af549fd resolve some Emerald differences 2019-07-29 20:44:18 -05:00
garak
39683e0362 use more accurate metatile collision expression 2019-07-29 14:47:08 -04:00
garak
e1854c665d name trainers eye messages, use constants in some pokenav rodata 2019-07-29 12:07:18 -04:00
PikalaxALT
b8393b3a79 Merge pull request #751 from pret/revert-colordiff
Revert migration to `colordiff` in asmdiff.sh
2019-07-29 10:58:36 -04:00
PikalaxALT
61c433d5c3 Revert migration to colordiff in asmdiff.sh
`colordiff` breaks output piping and invokes an additional dependency that no one needs
2019-07-29 10:58:07 -04:00
Cameron Hall
3f477dae36 Merge pull request #750 from camthesaxman/filenames_1
emerald file names, part 1
2019-07-28 21:23:43 -05:00
camthesaxman
e03220c21d Merge branch 'master' into filenames_1 2019-07-28 20:36:33 -05:00