Commit Graph

  • 9e175a1037 Merge pull request #1735 from GriffinRichards/arena-const GriffinR 2022-08-20 22:54:32 -04:00
  • 81ef818f61 Merge pull request #1731 from GriffinRichards/missing-tag GriffinR 2022-08-20 22:43:52 -04:00
  • 76d2d92abb Merge branch 'pretmaster' into pret_clean2 Eduardo Quezada 2022-08-20 12:43:09 -04:00
  • 34af4331c5 Merge pull request #1727 from AsparagusEduardo/pret_clean GriffinRichards 2022-08-20 01:32:27 +00:00
  • 1685365cd4 Merge pull request #1727 from AsparagusEduardo/pret_clean GriffinR 2022-08-19 21:27:55 -04:00
  • 11b4958f23 Incorporate commented bug fixes in contest AI scripts GriffinR 2022-08-19 19:45:15 -04:00
  • d57442a511 Decimal paletteNums Martin Griffin 2022-08-19 16:32:00 +01:00
  • c2d5dd2a1f Additional battle anim sync GriffinR 2022-08-17 11:44:20 -04:00
  • 5719a7f7bc Use static inline instead of extern inline for modern Martin Griffin 2022-08-19 15:47:50 +01:00
  • 6fed961ed6 Write palette IDs in hex Martin Griffin 2022-08-19 15:29:35 +01:00
  • cce9918908 Add Wnum_tiles to additional num_tiles rules GriffinR 2022-08-18 23:13:27 -04:00
  • 5e593a62fb Ignore num_tiles if it would truncate non-transparent tiles (#1729) Martin Griffin 2022-08-19 04:07:25 +01:00
  • 3bc2cf921c Sync src/battle_controllers.c with pokefirered Eduardo Quezada 2022-08-08 10:06:30 -04:00
  • 59f89bde9e Misc cleanup Eduardo Quezada 2022-08-18 14:23:45 -04:00
  • fbcb80c575 (260/665) Eduardo Quezada 2022-08-18 11:13:02 -04:00
  • 936ebbd973 Fix phaseShit typo GriffinR 2022-08-17 11:47:00 -04:00
  • f87d86945f (256/665) Eduardo Quezada 2022-08-17 08:48:38 -04:00
  • e707cdffa8 Merge pull request #1744 from AsparagusEduardo/pret_syncMapSec GriffinR 2022-08-16 19:12:45 -04:00
  • 5933c42439 Synced Route 4 and 10's MapSec labels Eduardo Quezada 2022-08-16 18:23:37 -04:00
  • db2d524603 Corrected CopyFrontierBrainTrainerName Eduardo Quezada 2022-08-16 17:22:39 -04:00
  • d45fda5666 (241/665) Eduardo Quezada 2022-08-16 14:30:29 -04:00
  • 2ec8f27811 Add missing usage of SOUND_PAN_* GriffinR 2022-08-16 13:00:28 -04:00
  • e43f65cc69 using BATTLE_RUN constants in BattleScript_EffectTeleport Eduardo Quezada 2022-08-15 21:06:26 -04:00
  • 7b0c8ec972 Revert style changes Eduardo Quezada 2022-08-15 20:41:12 -04:00
  • 26734d80f3 Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum GriffinR 2022-08-15 18:51:32 -04:00
  • 44b26cc8aa From pokefirered Eduardo Quezada 2022-08-15 18:27:37 -04:00
  • 0149f420f9 Corrected comment Eduardo Quezada 2022-08-15 17:36:55 -04:00
  • e8a05e92e4 Corrected additional inconsistent uses of whitespace Eduardo Quezada 2022-08-15 17:04:34 -04:00
  • eb2ee02306 Merge pull request #1741 from tustin2121/tustin2121-patch-scriptcontext GriffinRichards 2022-08-15 20:50:31 +00:00
  • 96fa350b45 Merge pull request #1741 from tustin2121/tustin2121-patch-scriptcontext GriffinR 2022-08-15 16:46:01 -04:00
  • ec73158f16 Moving documentation comments per request tustin2121 2022-08-15 16:37:38 -04:00
  • 1cb659df8c Renaming Script Contexts tustin2121 2022-08-15 15:18:12 -04:00
  • 63e4a8adcd Fixed instances of .string being used with spaces instead of tabs Eduardo Quezada 2022-08-15 14:32:01 -04:00
  • 4649d1eddd (234/665) Eduardo Quezada 2022-08-15 14:27:41 -04:00
  • e1930820f2 Merge pull request #1738 from mrgriffin/wildcard-ld-script GriffinRichards 2022-08-15 12:40:50 +00:00
  • 3dc3dc847f Merge pull request #1738 from mrgriffin/wildcard-ld-script GriffinR 2022-08-15 08:35:48 -04:00
  • c5b30b7f21 Wildcards in ld_script.txt Martin Griffin 2022-08-13 06:35:35 +01:00
  • 5515e328b2 Clean up lock/unlock anim movement GriffinR 2022-08-12 21:18:10 -04:00
  • 11cc2179a4 (205/665) Italian up to date with French Eduardo Quezada 2022-08-12 15:31:25 -04:00
  • 2c1bf600e7 Merge pull request #1730 from GriffinRichards/sync-naming-screen GriffinRichards 2022-08-12 15:10:31 +00:00
  • 2df6cc1820 Merge pull request #1730 from GriffinRichards/sync-naming-screen GriffinR 2022-08-12 11:05:55 -04:00
  • ebc1ca8a2f Merge pull request #1725 from GriffinRichards/security-signature GriffinRichards 2022-08-12 14:52:13 +00:00
  • 574cf1ddb9 Merge pull request #1725 from GriffinRichards/security-signature GriffinR 2022-08-12 10:47:10 -04:00
  • 27f2b85efe Incorporated Italian changes, enough to compile (still needs to sync a couple of them) Eduardo Quezada 2022-08-12 00:28:16 -04:00
  • cf4d05e9e7 Fix typo GriffinR 2022-08-11 12:09:38 -04:00
  • 63468f9fcb Add some missing battle arena constants GriffinR 2022-08-11 12:02:56 -04:00
  • 8a46deb0e7 Merge pull request #1723 from GriffinRichards/fix-impassable GriffinRichards 2022-08-11 01:33:54 +00:00
  • 286a99eb1d Merge pull request #1723 from GriffinRichards/fix-impassable GriffinR 2022-08-10 21:28:14 -04:00
  • e814fe0224 Merge pull request #1734 from WhenGryphonsFly/clean__battledomebugfix GriffinR 2022-08-10 21:21:54 -04:00
  • 475658116e Fix BUGFIX return statement in battle_dome.c WhenGryphonsFly 2022-08-10 20:00:16 -05:00
  • cd5a03d4aa Merge pull request #1733 from WhenGryphonsFly/clean__pokeruspartysize GriffinR 2022-08-10 20:45:57 -04:00
  • 86881b12ef Use PARTY_SIZE for Pokerus Nurse Conversation WhenGryphonsFly 2022-08-10 19:09:59 -05:00
  • e06ba39751 Use button constants in Task_HandleChooseMonInput GriffinR 2022-08-10 15:14:35 -04:00
  • f534e8e44a Move party menu data constants GriffinR 2022-08-10 14:21:55 -04:00
  • ac032cdf9b (202/654) Title screen Eduardo Quezada 2022-08-10 10:59:03 -04:00
  • c0128e396b Moved french types to their own folder Eduardo Quezada 2022-08-10 09:31:18 -04:00
  • 06efaeb6df (200!/654) Eduardo Quezada 2022-08-10 09:16:02 -04:00
  • bb671d90a8 (197/654) Eduardo Quezada 2022-08-10 09:07:13 -04:00
  • 44ec57c1d5 Berry Blender graphics + Moved Easy Chat Eduardo Quezada 2022-08-09 18:20:17 -04:00
  • bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up GriffinR 2022-08-08 13:14:07 -04:00
  • 1fd1870a13 Moved enum to include/pokemon.h Eduardo Quezada 2022-08-08 18:40:47 -04:00
  • 75d52dc762 Convert MON_DATA constants into enum to ease editing and addition of fields. Eduardo Quezada 2022-08-08 18:18:17 -04:00
  • 9f23159c43 (185/654) Eduardo Quezada 2022-08-08 15:52:16 -04:00
  • 92eada1251 Bard sounds Eduardo Quezada 2022-08-08 13:01:43 -04:00
  • fdf99fefb8 Abilities and Ribbon descriptions + fix in strings.c Eduardo Quezada 2022-08-08 12:07:40 -04:00
  • 860df0bd97 Merge remote-tracking branch 'pret/master' into pret_french Eduardo Quezada 2022-08-08 11:22:44 -04:00
  • 4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 Eduardo Quezada 2022-08-07 22:40:15 -04:00
  • 079b1762ac Update special save sector size checks GriffinR 2022-08-05 12:11:33 -04:00
  • 2487ddb128 Sector security -> signature GriffinR 2022-08-05 10:31:50 -04:00
  • 84d3bef333 Merge pull request #1724 from DizzyEggg/lang_improvements GriffinRichards 2022-08-05 01:43:12 +00:00
  • aa9ccbf194 Merge pull request #1724 from DizzyEggg/lang_improvements GriffinR 2022-08-04 21:37:19 -04:00
  • c991131b75 Change language stuff based on the french decomp DizzyEggg 2022-08-04 11:53:16 +02:00
  • e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes GriffinR 2022-08-03 14:21:13 -04:00
  • fa3abf90c4 (148/654) Eduardo Quezada 2022-08-03 11:25:11 -04:00
  • 58d0fba024 (125/654) Eduardo Quezada 2022-08-02 18:21:19 -04:00
  • b8dbe69edb (102/654) Eduardo Quezada 2022-08-02 17:11:18 -04:00
  • c05c6bfe24 (90/654) Eduardo Quezada 2022-08-02 15:44:28 -04:00
  • f2f74b94d2 (68/654) Eduardo Quezada 2022-08-02 14:03:42 -04:00
  • 36d3bc860e Merge pull request #1702 from GriffinRichards/clean-psn GriffinRichards 2022-08-02 17:25:32 +00:00
  • 79384ec9f3 Merge pull request #1702 from GriffinRichards/clean-psn GriffinR 2022-08-02 13:20:49 -04:00
  • 99a37b5aa5 Merge pull request #1717 from mrgriffin/trainer-party-macro GriffinR 2022-08-02 13:11:43 -04:00
  • 1b30bccb47 (56/654) Eduardo Quezada 2022-08-02 12:18:17 -04:00
  • 18cdd708b5 (56/654) Berry fix gba file + finalizing format for inc files Eduardo Quezada 2022-08-02 11:05:56 -04:00
  • 4e137fb43c (55/654) src/battle_message.c and adjustments to Makefile Eduardo Quezada 2022-08-02 10:01:09 -04:00
  • 120a11ac12 54/654, going to bed Eduardo Quezada 2022-08-02 01:08:52 -04:00
  • 68e7ab9fec 50/654 Eduardo Quezada 2022-08-02 00:14:41 -04:00
  • b2160d50bb 37/654 Eduardo Quezada 2022-08-01 23:35:34 -04:00
  • 6b8d17497f Finished the rest of the Abandoned Ship text Eduardo Quezada 2022-08-01 18:30:55 -04:00
  • a59b1fb9d2 First pair Eduardo Quezada 2022-08-01 17:53:15 -04:00
  • bec4127e20 Added missing makefile changes Eduardo Quezada 2022-08-01 17:41:25 -04:00
  • 0f6f1d88a4 Merge pull request #1721 from AsparagusEduardo/pret_clean2 GriffinRichards 2022-08-01 21:02:55 +00:00
  • 79c5a5983e Merge pull request #1721 from AsparagusEduardo/pret_clean2 GriffinR 2022-08-01 16:57:40 -04:00
  • 62b81fea84 Setting up french makefile Eduardo Quezada 2022-08-01 16:16:52 -04:00
  • b49f8c10ad Review changes from https://github.com/pret/pokefirered/pull/525 Eduardo Quezada 2022-08-01 15:37:05 -04:00
  • cc288e3786 Review changes Eduardo Quezada 2022-08-01 15:14:21 -04:00
  • 7ea49adf3c CpuCopy16 in UnkUtil_CpuRun Eduardo Quezada 2022-08-01 08:04:48 -04:00
  • a72d4c4168 Cleanup from syncing pss and mon markings Eduardo Quezada 2022-07-30 12:41:12 -04:00
  • 6d441dfa8c Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands GriffinRichards 2022-07-30 13:14:59 +00:00
  • 5101811407 Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands GriffinR 2022-07-30 09:09:23 -04:00
  • 897b3d07f6 Sync src/pokeball.c with pokefirered Eduardo Quezada 2022-07-29 21:29:12 -04:00