Commit Graph

  • 10f0222d28 Battle controller opponent sync labels from emerald PikalaxALT 2021-03-16 08:24:53 -04:00
  • a2367448b8 sync berry crush with emerald Kurausukun 2021-03-16 03:49:48 -04:00
  • 14aa5bf52f Remove unused, unneeded fields from BattleHealthboxInfo PikalaxALT 2021-03-15 20:17:47 -04:00
  • 81da6acff5 battle_gfx_sfx_util sync emerald names to unnamed syms PikalaxALT 2021-03-15 19:32:49 -04:00
  • c6563b78c0 Sync new field name in BattleStruct PikalaxALT 2021-03-15 16:19:15 -04:00
  • 2f4f63afdb Document old man batttle controller PikalaxALT 2021-03-15 14:27:50 -04:00
  • 67cdab24f8 Use macro in BufferPartyVsScreenHealth_AtEnd PikalaxALT 2021-03-15 08:37:11 -04:00
  • df9bed0548 Revert HERE and USED macros PikalaxALT 2021-03-15 08:33:37 -04:00
  • 37537e38f9 Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer PikalaxALT 2021-03-14 21:04:11 -04:00
  • 5075067ecd Merge pull request #402 from GriffinRichards/nonmatch-fix PikalaxALT 2021-03-14 20:52:30 -04:00
  • 31f4edbe50 Document more symbols in battle PikalaxALT 2021-03-14 20:10:19 -04:00
  • 077faeb1bd Use global symbols for assembly on modern GriffinR 2021-03-14 19:13:23 -04:00
  • 99ec579deb Name symbols in battle_anim_special.c PikalaxALT 2021-03-14 16:29:33 -04:00
  • 75b9fbc92f check __CLION_IDE__ predefine in global.h PikalaxALT 2021-03-13 17:51:27 -05:00
  • d87e2e2fc2 Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer PikalaxALT 2021-03-13 17:50:30 -05:00
  • e1f76f1689 Merge pull request #401 from SethBarberee/emerald_backport_1 GriffinR 2021-03-13 16:53:10 -05:00
  • 6bcf9e64b1 backport 2 nonmatching fixes from emerald Seth Barberee 2021-03-12 16:16:57 -06:00
  • f7f7e9a70d More documentation in battle_main PikalaxALT 2021-03-12 16:56:09 -05:00
  • b38a5a85d4 Resolve link comm buffers in gBattleStruct PikalaxALT 2021-03-12 15:37:28 -05:00
  • 4d1e074514 Fix Son/Daughter name swap GriffinR 2021-03-12 12:47:51 -05:00
  • 1c03a923b7 Merge pull request #399 from Deokishisu/patch-1000 GriffinR 2021-03-11 15:11:53 -05:00
  • 651b59d631 Update calcrom ignore path GriffinR 2021-03-10 18:11:47 -05:00
  • 28e3522acb Use NONMATCHING on modern for gcc-arm-none-eabi GriffinR 2021-03-10 17:55:46 -05:00
  • bf6e80850c Sync Berry Fix makefiles with pokeemerald GriffinR 2021-03-10 17:16:45 -05:00
  • b2f0efc6f7 Replace Travis CI with Github workflow GriffinR 2021-03-08 03:03:53 -05:00
  • a7233dcd0c Use GENDER_COUNT Constants & Rename an Unknown in field_player_avatar.c Deokishisu 2021-03-10 16:45:11 -05:00
  • 0589bd5827 Fix Typos / Use Box Constants Deokishisu 2021-03-10 16:22:08 -05:00
  • 42b93f8359 Merge pull request #398 from SethBarberee/patch-1 GriffinR 2021-03-03 19:56:49 -05:00
  • 897290a93e Add -DINFO Seth Barberee 2021-03-03 16:41:50 -08:00
  • 12c7dab219 Merge pull request #396 from hjk321/storage-magic GriffinR 2021-02-22 11:26:52 -05:00
  • fc16ee9498 Fix storage magic numbers hjk321 2021-02-22 10:04:27 -06:00
  • 5351028d7e Merge pull request #394 from GriffinRichards/calcrom100 GriffinR 2021-02-19 20:35:04 -05:00
  • 003d6b95d9 Celebratory change to calcrom.pl GriffinR 2021-02-19 20:09:01 -05:00
  • b4c5559613 Merge pull request #393 from Kurausukun/text_printer GriffinR 2021-02-19 19:44:11 -05:00
  • b061e68f21 oops forgot one Kurausukun 2021-02-19 17:50:00 -05:00
  • 885f4a8871 remove redundant parentheses Kurausukun 2021-02-19 17:47:56 -05:00
  • 33126a0633 Merge pull request #392 from Deokishisu/ExternalEvents-doc GriffinR 2021-02-16 17:55:56 -05:00
  • 57e3f5e0f8 Mirror pokeemerald PR#1329 & PR#1335 to pokefirered Deokishisu 2021-02-16 16:56:31 -05:00
  • 616200ee66 [LEAK-INFORMED] match rest of text_printer Kurausukun 2021-02-16 02:32:41 -05:00
  • bc4f88d72c Merge pull request #391 from Deokishisu/movement_type-rename GriffinR 2021-02-14 21:48:36 -05:00
  • fc623d2abf Rename "Hidden" Movement Type to "Buried" Deokishisu 2021-02-14 14:59:10 -05:00
  • 8c66bde715 Merge pull request #388 from GriffinRichards/constants-localids GriffinR 2021-02-14 14:07:32 -05:00
  • b422fd4a49 Merge pull request #389 from Kurausukun/dexmatching GriffinR 2021-02-14 11:18:46 -05:00
  • 43033ec97c Merge pull request #390 from GriffinRichards/fix-constwarning GriffinR 2021-02-12 19:17:24 -05:00
  • 1b84bd395d Fix warning about gMonPaletteTable section GriffinR 2021-02-12 17:18:14 -05:00
  • ccd75ad32e words are hard Kurausukun 2021-02-11 23:12:55 -05:00
  • 2ff02b3c5a fix whitespace, update dex category macro Kurausukun 2021-02-11 23:06:33 -05:00
  • 6c77c7a714 [LEAK-INFORMED] match the rest of pokedex_screen Kurausukun 2021-02-11 21:50:39 -05:00
  • 515dde69af Use more LOCALID constants GriffinR 2021-02-10 20:20:15 -05:00
  • a34c9d09b6 Merge pull request #385 from Deokishisu/patch-3 GriffinR 2021-02-09 13:13:52 -05:00
  • 60b9b0add2 Fix Trainer Tower Magic Number Deokishisu 2021-02-09 11:20:52 -05:00
  • efba18bb0b Merge pull request #384 from Deokishisu/patch-2 GriffinR 2021-02-05 07:18:01 -05:00
  • b423d06cd9 Fix "Compatibility" Misspelling Deokishisu 2021-02-05 01:17:54 -05:00
  • 8a0294f9f1 Merge pull request #383 from Deokishisu/patch-2 GriffinR 2021-02-03 20:49:41 -05:00
  • ee0fb9ea5a Fix TM34 Transposition Typo Deokishisu 2021-02-03 19:54:45 -05:00
  • 80b2c0eee6 Merge pull request #382 from GriffinRichards/relativeconstants GriffinR 2021-02-01 14:57:18 -05:00
  • 1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count GriffinR 2021-01-29 15:37:52 -05:00
  • 419c897292 Merge pull request #380 from GriffinRichards/sync-scaninc GriffinR 2021-01-19 02:17:21 -05:00
  • a52d6e4379 Fix modern ld_script GriffinR 2021-01-19 02:06:27 -05:00
  • 9d20f55a58 Move 'source' asm files to src GriffinR 2021-01-19 01:54:14 -05:00
  • 9350e2d338 Sync mapjson with pokeemerald GriffinR 2021-01-19 01:38:15 -05:00
  • 393a6bd5b6 Sync gbagfx with pokeemerald GriffinR 2021-01-19 01:28:49 -05:00
  • 538c1d0efd Sync preproc with pokeemerald GriffinR 2021-01-19 01:19:32 -05:00
  • 8e8677f1e4 Update Makefile for scaninc GriffinR 2021-01-19 01:19:19 -05:00
  • cd67c5e240 Sync scaninc with pokeemerald GriffinR 2021-01-18 23:39:05 -05:00
  • ac62e8e563 Merge pull request #377 from Deokishisu/master GriffinR 2021-01-08 08:11:13 -05:00
  • 90e5a5ff7e Fix Egregious Magic Numbers in GetBattleBGM Deokishisu 2021-01-08 04:09:59 -05:00
  • 135fd3948a Merge pull request #376 from SatoMew/master GriffinR 2021-01-07 00:35:31 -05:00
  • e5d0a4f35c Document the unused battle strings for downpour and rain weather SatoMew 2021-01-01 14:38:25 +00:00
  • 22cd65bd55 Merge pull request #375 from GriffinRichards/deadname GriffinR 2020-12-31 14:36:01 -05:00
  • 9509797b98 Remove deadnaming, sync BgEvent GriffinR 2020-12-31 14:24:30 -05:00
  • 2183626229 Merge pull request #374 from Deokishisu/patch-1 GriffinR 2020-12-31 12:40:31 -05:00
  • 6e77eef0cd Fix Missed Magic Numbers in main_menu.c Deokishisu 2020-12-31 11:36:27 -05:00
  • f8a1bf14fb Merge pull request #371 from GriffinRichards/data-pokedex GriffinR 2020-11-27 11:12:05 -05:00
  • 7377bc438b Merge pull request #373 from V-FEXrt/farfetchd GriffinR 2020-11-27 10:57:55 -05:00
  • 06b6853fb8 Rename farfetchd graphics to match define Ashley Coleman 2020-11-26 11:26:05 -08:00
  • 46a9525534 Merge pull request #372 from V-FEXrt/trainer_parties_variables GriffinR 2020-11-15 20:15:12 -05:00
  • 83fe4e5dd8 Rename unknown trainer party variables Ashley Coleman 2020-11-12 21:06:49 -08:00
  • f2e7684b17 Fix modern build GriffinR 2020-11-12 00:53:57 -05:00
  • 1d820d4e0f Clean up pokedex screen text GriffinR 2020-11-12 00:03:59 -05:00
  • 66e9059578 Move pokedex_screen data from asm to C GriffinR 2020-11-11 21:02:20 -05:00
  • 8485cec283 Merge pull request #1 from pret/master Ashley Coleman 2020-11-11 15:46:56 -08:00
  • 2062659541 Merge pull request #370 from V-FEXrt/pokedex-screen GriffinR 2020-11-11 17:53:11 -05:00
  • 2745ac3445 Give meaningfull names to globals in pokedex_screen.s Ashley Coleman 2020-11-11 13:40:18 -08:00
  • 8669fe0f95 Merge pull request #368 from Kurausukun/match_m4a GriffinR 2020-11-02 11:48:06 -05:00
  • feb10af9f8 Match FadeOutBody (ported from pokeemerald) Kurausukun 2020-11-01 23:35:10 -05:00
  • 7b8c935926 Merge pull request #365 from GriffinRichards/moves-const GriffinR 2020-10-11 16:26:00 -04:00
  • 0f21fc13ef Fix hang when releasing after adding new moves GriffinR 2020-10-11 16:10:03 -04:00
  • f9ce82fd74 Merge pull request #364 from Kurausukun/audio_macros GriffinR 2020-09-28 08:04:10 -04:00
  • 86445c2131 update audio macros Kurausukun 2020-09-27 22:38:52 -04:00
  • 9cb570dc1b Merge pull request #362 from Kurausukun/rename_instruments GriffinR 2020-09-23 23:40:22 -04:00
  • 4df870b7dc rename instruments (again) Kurausukun 2020-09-23 22:35:00 -04:00
  • 03f516bce3 Merge pull request #361 from PikalaxALT/match_naked PikalaxALT 2020-09-08 16:07:59 -04:00
  • 6170072017 Resolve travis config warnings PikalaxALT 2020-09-08 15:41:09 -04:00
  • a0fbb82a7c Match sub_8159AB8 PikalaxALT 2020-09-08 14:59:40 -04:00
  • 6c5a10767f Merge pull request #360 from BigBahss/leafgreen-encounters-prefix GriffinR 2020-09-07 04:58:51 -04:00
  • abc2915eb0 Add "MAP_" prefix missing from 76e126a35b BigBahss 2020-09-06 23:51:51 -04:00
  • 76e126a35b Add "MAP_" prefix to LeafGreen "map" fields BigBahss 2020-09-06 22:56:49 -04:00
  • c040ec2475 Merge pull request #359 from PikalaxALT/agb_flash_fix PikalaxALT 2020-09-03 16:07:52 -04:00
  • ecc3da6e2f Fix agb_flash in modern frlg PikalaxALT 2020-09-03 15:55:52 -04:00