Commit Graph

1713 Commits

Author SHA1 Message Date
PikalaxALT 3b2eaeedbc Merge branch 'master' into modern_gcc 2020-02-13 15:13:30 -05:00
GriffinR 6c5f3e3470 Sync with pret/pokeemerald:959 2020-02-12 18:35:27 -06:00
GriffinR 68fecc9f72 Rename event_obj_lock to event_object_lock 2020-02-12 18:35:27 -06:00
GriffinR 667c53e25b Fix event object include guards and constant filenames 2020-02-12 18:35:27 -06:00
GriffinR 98ca62cf91 Standardize Event Object to Object Event 2020-02-12 18:35:27 -06:00
PikalaxALT cafbffd5b8 Fix name error 2019-12-17 11:53:57 -05:00
PikalaxALT 04d158cfcd Merge branch 'master' of github.com:pret/pokeruby into modern_gcc 2019-12-14 11:56:41 -05:00
huderlem d63e99c418 Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
2019-10-19 08:08:03 -05:00
GriffinR 11170ce90c Sync specialvars with pokeemerald 2019-10-16 20:22:11 -05:00
GriffinR 3773318935 Fix misnamed Mossdeep Gym metatiles 2019-10-16 20:21:29 -05:00
garak fc2926aa46 add fishing rod groups to encounter json 2019-10-16 20:09:49 -05:00
PikalaxALT 99e6a6639e Merge branch 'master' into debug-english 2019-10-02 11:50:17 -04:00
PikalaxALT e97f37077c Merge branch 'master' into emerald_diff 2019-10-02 11:48:20 -04:00
PikalaxALT 8c86b656d2 Merge branch 'master' into modern_gcc 2019-10-02 11:44:50 -04:00
PikalaxALT 1bd678656c Merge pull request #743 from garakmon/metatile_labels
Name Metatiles
2019-09-08 12:43:57 -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
PikalaxALT 3d3ec3150a Merge branch 'master' into modern_gcc 2019-09-05 09:38:27 -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
camthesaxman bbd177fa20 fix more emerald differences 2019-07-31 18:29:13 -05:00
ultima-soul dee6732764 Finish synchronizing bard_music data organization. 2019-07-31 00:01:20 -07:00
camthesaxman b74a0c3122 resolve more battle system differences 2019-07-31 00:13:42 -05:00
camthesaxman 0ba4eb4780 misc 2019-07-30 22:11:27 -05:00
ultima-soul 9ee6622f83 Start bard_music synchronization. 2019-07-30 19:49:31 -07: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
PikalaxALT 78535eea89 Merge branch 'master' into modern_gcc 2019-07-29 09:46:02 -04:00
camthesaxman e03220c21d Merge branch 'master' into filenames_1 2019-07-28 20:36:33 -05:00
camthesaxman 00b44d5886 emerald file names, part 1 2019-07-28 20:33:25 -05:00
Revo d442be1210 Merge pull request #749 from camthesaxman/vram
remove hardcoded VRAM and EWRAM addresses
2019-07-28 20:26:50 -04:00
camthesaxman 00b0b0bb90 remove hardcoded VRAM and EWRAM addresses 2019-07-28 19:17:39 -05:00
camthesaxman 92dd1f106b match atk49_moveend 2019-07-28 18:28:15 -05:00
garak ad365a35c1 name metatiles 2019-07-18 15:10:32 -04:00
PikalaxALT 049085c761 Implement debug info option 2019-07-03 11:55:32 -04:00
PikalaxALT 0f19a99599 Remove the FLOAT_Uxx and DOUBLE_Uxx macros 2019-07-03 10:12:16 -04:00
PikalaxALT 48d2923bc6 Merge branch 'master' into modern_gcc 2019-07-02 21:05:03 -04:00
PikalaxALT 770d4531dc Some more cleanup 2019-07-02 19:29:49 -05:00
PikalaxALT 8a5fe8781a Finish roulette data 2019-07-02 19:29:49 -05:00
PikalaxALT a437045526 through gSpriteTemplate_83FA0DC 2019-07-02 19:29:49 -05:00
PikalaxALT 04abad96dd Split roulette on purported file boundary 2019-07-02 19:29:49 -05:00
PikalaxALT 425461c54e through gUnknown_083F8EBC 2019-07-02 19:29:49 -05:00
PikalaxALT 5d268f0acf Make Ruby compile with gcc-8 2019-06-26 19:47:30 -04:00
PikalaxALT 4fedd5183b Attempt sub_809C664 2019-04-23 19:58:51 -05:00
PikalaxALT d00b5ae399 match sub_809C464 2019-04-23 19:58:51 -05:00
PikalaxALT 6e6edda078 Define LINK_BATTLE_OPPONENT; other opponent constant substitutions 2019-04-23 19:57:44 -05:00
PikalaxALT 1eb17b1921 Some documentation of contest_link_80C2020 2019-04-08 17:33:35 -05:00
PikalaxALT 0c690920ab through sub_80C4A28 2019-04-08 17:33:35 -05:00
PikalaxALT 15e5d022da through sub_80C3EA4 2019-04-08 17:33:35 -05:00