Commit Graph

  • f096196c91 Merge branch 'master' into porymap-5 GriffinR 2022-10-27 14:16:25 -04:00
  • d1178f7f8f Merge pull request #567 from GriffinRichards/doc-get-move-actions GriffinR 2022-10-27 14:15:12 -04:00
  • 014af0b049 Merge pull request #565 from GriffinRichards/text-window GriffinRichards 2022-10-27 18:04:48 +00:00
  • aa092e819e Merge pull request #565 from GriffinRichards/text-window GriffinR 2022-10-27 13:57:35 -04:00
  • 2b2bf84502 Use actual flag values for hidden items GriffinR 2022-10-25 14:45:53 -04:00
  • c77adaf6bf Sync map data macros GriffinR 2022-10-25 14:31:01 -04:00
  • 32ab6087d8 Merge pull request #484 from GriffinRichards/clone-union GriffinR 2022-10-17 21:29:52 -04:00
  • a533ff70e7 Merge pull request #568 from GriffinRichards/tilesets-c GriffinR 2022-10-10 12:48:37 -04:00
  • 7178aa8b99 Set unused tiles to transparent, document adjacent files GriffinR 2022-10-08 20:44:08 -04:00
  • 2b6f0e11ff Merge pull request #566 from GriffinRichards/doc-scripts GriffinRichards 2022-10-09 14:11:58 +00:00
  • 26c0debb55 Merge pull request #566 from GriffinRichards/doc-scripts GriffinR 2022-10-09 10:05:37 -04:00
  • edc478c1c4 Sync -num_tiles flags GriffinR 2022-10-08 20:15:22 -04:00
  • 5dfc494c00 Convert tilesets.s to C GriffinR 2022-10-08 00:12:36 -04:00
  • 06c74189df Merge pull request #564 from GriffinRichards/sync-field-screen-effect GriffinRichards 2022-10-07 03:07:33 +00:00
  • a79588df73 Merge pull request #564 from GriffinRichards/sync-field-screen-effect GriffinR 2022-10-06 23:01:46 -04:00
  • 57e82c9264 Label movement action arrays, z coord -> elevation GriffinR 2022-10-05 17:16:40 -04:00
  • aeb1c74bbf Label remaining scripts GriffinR 2022-10-05 15:25:03 -04:00
  • 3de70980e5 Document text window GriffinR 2022-10-05 13:10:26 -04:00
  • 9fffa1fae2 Sync field_screen_effect GriffinR 2022-10-04 19:21:28 -04:00
  • 583c38a437 Merge pull request #563 from cbt6/item-use GriffinRichards 2022-10-03 18:43:59 +00:00
  • b41b3614ad Merge pull request #563 from cbt6/item-use GriffinR 2022-10-03 14:38:39 -04:00
  • 32573b2ba9 Document item use cbt6 2022-10-04 00:51:38 +08:00
  • e3b3326c1c Merge pull request #562 from GriffinRichards/sync-palette GriffinRichards 2022-10-02 12:11:07 +00:00
  • 4b5bbbf1b7 Merge pull request #562 from GriffinRichards/sync-palette GriffinR 2022-10-02 08:05:59 -04:00
  • 77238d182d Correct bag anim names GriffinR 2022-10-02 07:58:27 -04:00
  • ab2aacc9d5 Sync berry_fix_program GriffinR 2022-10-02 00:10:53 -04:00
  • 54f9b62ede Label minigame_digits GriffinR 2022-10-01 23:47:18 -04:00
  • a247433e20 Sync/document item_menu_icons.c GriffinR 2022-10-01 23:26:32 -04:00
  • 4e3dedd6fa Sync palette GriffinR 2022-10-01 20:55:59 -04:00
  • e2db9bdd96 Merge pull request #558 from GriffinRichards/doc-intro GriffinRichards 2022-09-30 05:59:20 +00:00
  • fc836b9de4 Merge pull request #558 from GriffinRichards/doc-intro GriffinR 2022-09-30 01:53:07 -04:00
  • f901d5da76 Merge pull request #559 from GriffinRichards/doc-diploma GriffinRichards 2022-09-30 05:45:30 +00:00
  • 2e9ce9b2a0 Merge pull request #559 from GriffinRichards/doc-diploma GriffinR 2022-09-30 01:39:35 -04:00
  • 78c1a2ce46 Merge pull request #557 from GriffinRichards/sync-cries GriffinR 2022-09-26 20:36:30 -04:00
  • 3c9a9f7388 Merge pull request #560 from lioniac/mystery-gift-vars GriffinR 2022-09-26 12:50:55 -04:00
  • 91506ed233 Merge pull request #561 from cbt6/tilesets-h GriffinR 2022-09-26 11:17:13 -04:00
  • c26afe5e1b Remove include/tilesets.h cbt6 2022-09-26 22:33:56 +08:00
  • fe757ff8ae Updated vars.h lioniac 2022-09-26 10:31:44 -03:00
  • 8fb7eebfb9 Naming Mystery Gift Vars lioniac 2022-09-26 10:29:31 -03:00
  • 87def58265 Merge pull request #518 from GriffinRichards/format-obj GriffinR 2022-09-25 21:58:52 -04:00
  • 7b5f4a00cb Merge pull request #500 from garakmon/rme_updates GriffinR 2022-09-25 21:58:27 -04:00
  • 7807b198d3 Ignore new Porymap config GriffinR 2022-09-25 18:35:25 -04:00
  • 4a3ef4f9b2 Ignore Porymap's prefabs file GriffinR 2022-09-24 18:22:49 -04:00
  • 7ee4e1d140 Document remainder of diploma GriffinR 2022-09-24 17:44:51 -04:00
  • fa9808f79d Document intro functions GriffinR 2022-09-23 15:42:53 -04:00
  • 536f40b386 Sync cries with pokeemerald GriffinR 2022-09-22 14:36:16 -04:00
  • a374362854 Merge pull request #555 from GriffinRichards/doc-strings GriffinRichards 2022-09-22 17:47:38 +00:00
  • efdcae1e47 Merge pull request #555 from GriffinRichards/doc-strings GriffinR 2022-09-22 13:42:28 -04:00
  • aeef671c42 Merge branch 'master' of https://github.com/pret/pokefirered into doc-strings GriffinR 2022-09-22 13:36:32 -04:00
  • 3effa01c18 Merge pull request #556 from cbt6/party-menu GriffinRichards 2022-09-22 17:12:00 +00:00
  • 77c34e195e Merge pull request #556 from cbt6/party-menu GriffinR 2022-09-22 13:06:42 -04:00
  • e33ed44b7f Add parentheses and case statements cbt6 2022-09-23 00:39:59 +08:00
  • 500a488442 Remove goto in ItemUseCB_MedicineStep cbt6 2022-09-17 16:21:42 +08:00
  • 61ad87a314 Document party menu cbt6 2022-09-17 14:29:32 +08:00
  • 27b2b0b24a Document intro graphics/data GriffinR 2022-09-06 19:13:57 -04:00
  • 7b2da8e402 Sync/document the rest of strings.c GriffinR 2022-09-13 14:14:36 -04:00
  • 3090009987 Merge pull request #554 from GriffinRichards/sync-ec-strings GriffinRichards 2022-09-13 00:24:38 +00:00
  • 803c686569 Merge pull request #554 from GriffinRichards/sync-ec-strings GriffinR 2022-09-12 20:19:32 -04:00
  • c4cf82f439 Sync easy chat strings GriffinR 2022-09-12 18:27:34 -04:00
  • b0e8556ea8 Merge pull request #553 from GriffinRichards/sync-fld-weather-eff GriffinRichards 2022-09-12 22:01:26 +00:00
  • f08115d9fe Merge pull request #553 from GriffinRichards/sync-fld-weather-eff GriffinR 2022-09-12 17:56:14 -04:00
  • 5ab438d2c6 Merge pull request #550 from GriffinRichards/sync-urmsg GriffinRichards 2022-09-12 21:17:10 +00:00
  • 228869156c Merge pull request #550 from GriffinRichards/sync-urmsg GriffinR 2022-09-12 17:10:15 -04:00
  • f4a5c3dfb4 Merge pull request #552 from GriffinRichards/sync-keyboardtext GriffinRichards 2022-09-12 19:10:16 +00:00
  • ffaea1265b Merge pull request #552 from GriffinRichards/sync-keyboardtext GriffinR 2022-09-12 15:03:52 -04:00
  • 05507dfdff Merge pull request #551 from GriffinRichards/sync-rouletteutil GriffinRichards 2022-09-12 19:01:51 +00:00
  • f59fb1710f Merge pull request #551 from GriffinRichards/sync-rouletteutil GriffinR 2022-09-12 14:55:30 -04:00
  • b8c1273a9a Merge pull request #549 from AsparagusEduardo/pret_unused GriffinRichards 2022-09-12 18:54:16 +00:00
  • c9281e5a57 Add more usage of GENDER_COUNT GriffinR 2022-09-12 14:54:05 -04:00
  • 398417593b Merge pull request #549 from AsparagusEduardo/pret_unused GriffinR 2022-09-12 14:47:25 -04:00
  • 46221f5369 Merge pull request #545 from GriffinRichards/sync-fieldmap GriffinRichards 2022-09-12 18:38:17 +00:00
  • 0a01d8f31b Merge pull request #545 from GriffinRichards/sync-fieldmap GriffinR 2022-09-12 14:31:51 -04:00
  • 212e455aae Sync field weather effects GriffinR 2022-09-06 15:14:27 -04:00
  • d08aa80a70 Sync palette util GriffinR 2022-09-06 14:34:52 -04:00
  • fc7da1aa5e Sync keyboard text GriffinR 2022-09-06 14:10:43 -04:00
  • 8fd8d21980 Document global ur text GriffinR 2022-09-06 01:36:11 -04:00
  • 8a7f1cf1ce Sync static text in ur message GriffinR 2022-09-05 23:07:27 -04:00
  • b5c6bf19fc Merge pull request #548 from AsparagusEduardo/pokefirered_pokeemeraldSync4 GriffinRichards 2022-09-06 01:05:17 +00:00
  • faac89f686 Merge pull request #548 from AsparagusEduardo/pokefirered_pokeemeraldSync4 GriffinR 2022-09-05 21:00:13 -04:00
  • 7dcac240d4 Review changes Eduardo Quezada 2022-09-04 21:23:24 -03:00
  • b6bc114ef1 Review suggestions Eduardo Quezada 2022-09-04 20:56:14 -03:00
  • 81ef26732d Removed UNUSED attribute Eduardo Quezada 2022-09-04 18:06:58 -03:00
  • 9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4 Eduardo Quezada 2022-09-04 17:44:13 -03:00
  • 413c7c534f Merge pull request #547 from cbt6/field-moves GriffinRichards 2022-09-04 14:57:14 +00:00
  • b3c7b9e09f Merge pull request #547 from cbt6/field-moves GriffinR 2022-09-04 10:52:05 -04:00
  • dbaf8f5900 Document field moves cbt6 2022-09-04 17:55:15 +08:00
  • bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants GriffinR 2022-09-03 14:59:18 -04:00
  • d895710963 Merge pull request #542 from GriffinRichards/sync-cableclub GriffinRichards 2022-09-03 18:33:11 +00:00
  • 0400ee2124 Merge branch 'master' into clone-union GriffinR 2022-09-03 14:31:04 -04:00
  • ccd527b782 Merge pull request #542 from GriffinRichards/sync-cableclub GriffinR 2022-09-03 14:27:13 -04:00
  • 7d1cd4d2a2 Merge pull request #543 from Jaizu/common_movement_naming GriffinRichards 2022-09-03 18:26:42 +00:00
  • 56fead7d16 Merge pull request #543 from Jaizu/common_movement_naming GriffinR 2022-09-03 14:20:33 -04:00
  • 76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub GriffinR 2022-09-03 14:19:50 -04:00
  • 12ef8e8027 Merge pull request #546 from cbt6/pokemon-storage GriffinRichards 2022-09-03 18:16:46 +00:00
  • 097fc309f6 Merge pull request #546 from cbt6/pokemon-storage GriffinR 2022-09-03 14:11:29 -04:00
  • 3a1994f7f7 Rearrange Pokemon storage source files cbt6 2022-09-03 23:35:07 +08:00
  • c0bf576445 Organize Pokemon storage graphics cbt6 2022-09-03 23:30:02 +08:00
  • 859ca7994e Document Pokemon storage system cbt6 2022-09-03 23:27:56 +08:00
  • d5dfd66812 CpuFastFill -> CpuFastFill16 in fieldmap GriffinR 2022-09-02 19:42:26 -04:00
  • dcdf31f020 Sync fieldmap GriffinR 2022-09-02 19:14:44 -04:00