Commit Graph

  • 034b7f0513 Fix conflicting PC window names GriffinR 2021-08-11 19:14:50 -04:00
  • 6838656949 Merge pull request #1489 from GriffinRichards/doc-playerpc GriffinRichards 2021-08-11 23:06:00 +00:00
  • 80348e7188 Merge branch 'master' into doc-itemmenu2 GriffinR 2021-08-11 19:01:47 -04:00
  • cc51627465 Merge pull request #1489 from GriffinRichards/doc-playerpc GriffinR 2021-08-11 18:59:58 -04:00
  • 7ced344e95 Merge pull request #1488 from GriffinRichards/doc-frontierpass2 GriffinRichards 2021-08-11 21:45:21 +00:00
  • 0bc26d9d79 Merge pull request #1488 from GriffinRichards/doc-frontierpass2 GriffinR 2021-08-11 17:40:55 -04:00
  • 3a14f4472d Merge pull request #1495 from GriffinRichards/fix-symbols GriffinR 2021-08-11 17:35:31 -04:00
  • 1860b7682f Allow symbols branch on forks GriffinR 2021-08-11 17:19:21 -04:00
  • 5098fbf7bb Fix symbols branch commit message, limit to upstream GriffinR 2021-08-11 17:09:03 -04:00
  • 2fb7440315 Merge pull request #1494 from GriffinRichards/tag-regionmap GriffinR 2021-08-11 12:24:36 -04:00
  • d951d7c363 Use tag constants in region_map.c GriffinR 2021-08-11 09:31:20 -04:00
  • 28a8fe191a Document item menu GriffinR 2021-08-03 02:17:01 -04:00
  • 2e892c6961 unsigned int -> u32 Kurausukun 2021-08-08 22:22:50 -04:00
  • ddb3911d0d oops Kurausukun 2021-08-08 20:49:29 -04:00
  • 0bceaab046 rename variable Kurausukun 2021-08-08 20:34:16 -04:00
  • b51d025f1c port cgb fakematching fixes (thanks to revo) Kurausukun 2021-08-08 20:33:21 -04:00
  • 0e33df21b9 Merge pull request #1491 from LOuroboros/inconsFlag GriffinR 2021-08-05 16:41:10 -04:00
  • b4c4650186 Corrected inconsistent flag label spelling LOuroboros 2021-08-05 17:26:03 -03:00
  • 3714963f0d Merge pull request #1490 from GriffinRichards/align-marts GriffinR 2021-08-05 14:35:45 -04:00
  • 44cd9eed6b Add align directives to all marts GriffinR 2021-08-04 11:50:33 -04:00
  • bd5cf07059 Merge branch 'master' into doc-playerpc GriffinR 2021-08-02 14:08:10 -04:00
  • 06b909bcd8 Document player pc GriffinR 2021-04-25 12:07:08 -04:00
  • 3e60a78406 Merge branch 'master' into doc-frontierpass2 GriffinR 2021-07-31 13:30:40 -04:00
  • 602855ea99 Document frontier pass GriffinR 2021-01-19 04:03:51 -05:00
  • d391486247 Merge pull request #1484 from GriffinRichards/remove-addrcomments GriffinR 2021-07-27 18:08:10 -04:00
  • 459b20d762 Merge pull request #1479 from PikalaxALT/flatten_sprite_pos GriffinR 2021-07-27 18:02:00 -04:00
  • 80c77fc120 Merge pull request #1487 from LOuroboros/hidden_item_flags GriffinR 2021-07-27 10:36:20 -04:00
  • 8012f4b25a Re-ordered the hidden item flags list Instead of sorting them by location, it makes more sense to sort them by their value. LOuroboros 2021-07-26 20:14:19 -03:00
  • b5bc762dc7 Merge pull request #1486 from sphericalice/pss-constant-fix GriffinR 2021-07-25 12:49:35 -04:00
  • 71de6ea939 Use the correct constant for PSS page comparison sphericalice 2021-07-24 18:54:37 +01:00
  • 0e22b21b14 Merge pull request #1485 from LOuroboros/patch-3 GriffinR 2021-07-23 13:15:46 -04:00
  • bfa824f761 Removed unused status ailment constants LOuroboros 2021-07-23 13:18:24 -03:00
  • e67729f647 Remove address comments in sound directory GriffinR 2021-07-21 00:56:04 -04:00
  • 06351bf63c Remove address comments GriffinR 2021-07-20 15:18:31 -04:00
  • bea170e8e9 Merge pull request #1483 from PikalaxALT/symbols_merge_commit PikalaxALT 2021-07-16 12:59:03 -04:00
  • 52512cfbe1 Use merge commit message for symbols branch PikalaxALT 2021-07-16 12:15:53 -04:00
  • a274cc6a76 Merge branch 'master' into flatten_sprite_pos GriffinR 2021-07-12 01:39:28 -04:00
  • 876a89eba4 Merge pull request #1482 from cstyles/physical-macro GriffinR 2021-07-12 01:25:05 -04:00
  • eab1d7b5b1 Use the IS_TYPE_PHYSICAL macro in AddMovePoints Collin Styles 2021-07-11 13:21:20 -07:00
  • 01f2381e01 Add LINK_MANAGER field comments from SDK GriffinR 2021-07-11 16:23:19 -04:00
  • 00dfb8bfb4 Commit from GitHub Actions (CI) GriffinRichards 2021-07-11 03:31:08 +00:00
  • 72bb2bd160 Merge pull request #1474 from GriffinRichards/clean-miragetower GriffinR 2021-07-10 23:26:41 -04:00
  • 4419337aeb Merge pull request #1481 from GriffinRichards/fix-symsname PikalaxALT 2021-07-08 08:00:16 -04:00
  • 2f1a997440 Use PR title for symbols branch commits GriffinR 2021-07-08 00:49:27 -04:00
  • 9153b44ca2 Label remaining region_map symbols GriffinRichards 2021-07-08 04:29:24 +00:00
  • 32fe412755 Merge pull request #1475 from GriffinRichards/doc-minor GriffinR 2021-07-08 00:24:56 -04:00
  • fced9e507d Merge pull request #1478 from Kurausukun/itemprint GriffinR 2021-07-08 00:15:45 -04:00
  • 810ca5f8ff Flatten pos fields in struct Sprite PikalaxALT 2021-07-07 09:11:52 -04:00
  • 0f538102d9 Add local id constants for C GriffinR 2021-07-05 13:54:43 -04:00
  • 42730a8315 Revert "remove gflib" Kurausukun 2021-07-03 17:39:33 -04:00
  • 3aa1f2f908 Fix some object lock names GriffinRichards 2021-07-03 15:25:54 +00:00
  • b4f66496ed Merge pull request #1471 from GriffinRichards/fix-lock GriffinR 2021-07-03 11:21:10 -04:00
  • 56b69157ef Merge pull request #1477 from SnorlaxMonster/comment-battledome GriffinR 2021-07-03 09:55:41 -04:00
  • 43c5107e4d Correct card lines in Battle Dome comments SnorlaxMonster 2021-07-03 22:38:22 +10:00
  • d2701b51ab Combine battle script labels, add EFFECT comments GriffinR 2021-07-02 15:32:05 -04:00
  • 2946342a6b Merge pull request #1476 from luckytyphlosion/master GriffinR 2021-07-02 15:07:27 -04:00
  • b3d66f5528 Merge branch 'master' of https://github.com/pret/pokeemerald luckytyphlosion 2021-07-02 12:53:12 -04:00
  • 9fd27fe855 Fix modern builds when devkitARM is not in PATH. luckytyphlosion 2021-07-02 12:52:31 -04:00
  • c42b5d783a Fix 'determining' typo GriffinR 2021-07-02 03:26:50 -04:00
  • 64d06f4c8f Condense battle AI scripts, minor clean up GriffinR 2021-07-02 02:40:10 -04:00
  • 8f43d1ebeb Document smart shopper TV show GriffinR 2021-07-02 01:45:23 -04:00
  • d73b3c05c6 Label remaining hall_of_fame symbols GriffinR 2021-07-02 01:02:28 -04:00
  • fe89a4d147 Label remaining region_map symbols GriffinR 2021-07-02 00:52:36 -04:00
  • 10886a586b Clean up mirage tower GriffinR 2021-04-27 02:30:26 -04:00
  • 3964820a84 Merge pull request #1473 from GriffinRichards/fix-div0 GriffinR 2021-07-01 14:26:34 -04:00
  • 93188ef0a8 Fix divide by 0 in Cmd_getexp GriffinR 2021-07-01 00:18:52 -04:00
  • 63b93c4611 Merge pull request #1472 from garakmon/hi GriffinR 2021-06-27 21:22:53 -04:00
  • d391c136d8 fix encounter slot logic to accomodate changes garakmon 2021-06-27 21:14:21 -04:00
  • 827c274979 Merge pull request #1470 from GriffinRichards/constants-ftrainerfemale GriffinR 2021-06-25 12:40:22 -04:00
  • 6d92b466e7 Add missing use of F_TRAINER_FEMALE GriffinR 2021-06-25 11:50:09 -04:00
  • e0b58592b2 Merge pull request #1469 from GriffinRichards/fix-contesthearts PikalaxALT 2021-06-21 13:59:50 -04:00
  • 810b51f96c Clarify contest heart tiles GriffinR 2021-06-21 13:48:03 -04:00
  • 7582a6b12e Merge pull request #1468 from ultima-soul/patch-1 GriffinR 2021-06-18 22:38:01 -04:00
  • 9407a1ac76 Replace hardcoded number in MakeCaptureStars. ultima-soul 2021-06-18 19:20:05 -07:00
  • d3afc11cca Port symfile implementation from Ruby, FireRed PikalaxALT 2021-06-18 17:09:23 +00:00
  • 182df7c101 Merge pull request #1465 from PikalaxALT/push_symbols PikalaxALT 2021-06-18 13:03:54 -04:00
  • 6ca73737cf Fix regex error PikalaxALT 2021-06-18 12:53:15 -04:00
  • 10c80230c4 change printItemFunc to use u32 instead of s32 Kurausukun 2021-06-18 00:15:45 -04:00
  • 8b59909ac5 remove gflib Kurausukun 2021-06-17 22:09:48 -04:00
  • 780da6bfd0 Merge pull request #1466 from Sewef/patch-1 GriffinR 2021-06-17 14:29:28 -04:00
  • fd55a0d015 Update src/battle_message.c Sewef 2021-06-17 14:12:06 +02:00
  • d02be421bc Fix sATypeMove_Table definition Sewef 2021-06-17 14:06:40 +02:00
  • ae8f6e29f8 Symplifi symfiles PikalaxALT 2021-06-16 14:43:35 -04:00
  • 457a08cff6 Initial commit PikalaxALT 2021-06-16 10:51:15 -04:00
  • 5ccac26f26 Port symfile implementation from Ruby, FireRed PikalaxALT 2021-06-16 11:03:23 -04:00
  • 69fb670955 Merge pull request #1464 from ExpoSeed/pret/map-header-flags GriffinR 2021-06-13 18:12:40 -04:00
  • b6b0062bd6 Change map header flags to use a bitfield ExpoSeed 2021-06-13 16:32:00 -05:00
  • b0dfaa92be Merge pull request #1460 from luckytyphlosion/remove-temps GriffinR 2021-06-13 17:51:17 -04:00
  • f85fb3af89 Merge pull request #1463 from sphericalice/item-eventscript-labels GriffinR 2021-06-13 08:32:52 -04:00
  • 0a94dba4a7 Rename item script labels to fit the established name scheme SphericalIce 2021-06-13 13:21:23 +01:00
  • e308dc8236 Merge pull request #1462 from ExpoSeed/pret/more-gray-less-grey GriffinR 2021-06-10 13:01:55 -04:00
  • 3ed06c2cc2 Remove remaining grey and replace with gray ExpoSeed 2021-06-10 11:36:10 -05:00
  • 7a7ebe1827 Merge pull request #1461 from Fontbane/patch-1 luckytyphlosion 2021-06-04 22:42:24 -04:00
  • 2fe7184d10 Rename sText_WildPkmnAppeared2 to reflect its use AJ Fontaine 2021-06-04 22:32:33 -04:00
  • 7189e4e26f Fix build on macos. luckytyphlosion 2021-06-03 21:05:56 -04:00
  • 7e1ae9f95d Remove debug print statements in Makefile. luckytyphlosion 2021-06-03 18:22:49 -04:00
  • 4687847ace Fix building with KEEP_TEMPS=1, and NODEP=1. luckytyphlosion 2021-06-03 17:46:09 -04:00
  • a21ceb2e3c Merge pull request #1457 from Kurausukun/const GriffinR 2021-06-02 16:28:39 -04:00
  • 92152e45e2 Fixes to makefile. luckytyphlosion 2021-06-01 23:22:15 -04:00
  • f0b41debc3 Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps luckytyphlosion 2021-06-01 20:40:27 -04:00