Commit Graph

  • 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
  • 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
  • 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
  • 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
  • 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
  • a30ea109c1 Merge pull request #544 from GriffinRichards/fix-b-msg GriffinR 2022-09-01 23:08:21 -04:00
  • 17a8498701 Fix battle message charmap copied from emerald GriffinR 2022-08-30 14:07:57 -04:00
  • ce612de462 Add Common_ to movements.inc Jaizu 2022-08-28 16:51:45 +02:00
  • 7c0b46f6da Merge pull request #541 from GriffinRichards/sync-script GriffinR 2022-08-26 23:55:31 -04:00
  • 321f5371d8 Sync cable club GriffinR 2022-08-25 15:03:04 -04:00
  • feccd302d7 Merge pull request #540 from GriffinRichards/sync-b-anim GriffinR 2022-08-25 10:09:32 -04:00
  • b06d2045fc Script_HeartIcon -> Script_XIcon GriffinR 2022-08-24 18:17:18 -04:00
  • da955aaf64 Document safari reactions, move b string ids to constants GriffinR 2022-08-23 11:11:50 -04:00
  • a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim GriffinR 2022-08-23 10:47:07 -04:00
  • feb3d9cbab Merge pull request #537 from GriffinRichards/doc-bmsg GriffinR 2022-08-23 10:45:48 -04:00
  • 72f76b19b3 Sync script.c GriffinR 2022-08-22 20:27:23 -04:00
  • 616ab63d94 More sync with battle controllers Eduardo Quezada 2022-08-20 16:13:03 -04:00
  • 8a793e73a5 Sync link_rfu_2 GriffinR 2022-08-19 15:22:32 -04:00
  • b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim GriffinR 2022-08-19 11:30:00 -04:00
  • 219a38578a Sync battle anim - script funcs GriffinR 2022-08-19 10:29:25 -04:00
  • c976547c02 Clean up FRLG-specific anim scripts GriffinR 2022-08-19 09:58:34 -04:00
  • 17b2faa182 Sync battle anim - scripts GriffinR 2022-08-18 14:42:26 -04:00
  • a3c2108af7 Sync battle anim - flying, header cleanup GriffinR 2022-08-18 12:31:06 -04:00
  • 2f03c4a62c src/battle_controller_link_opponent.c Eduardo Quezada 2022-08-18 14:17:56 -04:00
  • 9020751fc4 triedShinyMonAnim Eduardo Quezada 2022-08-18 14:17:35 -04:00
  • 9205e7ad67 Uses of DISPLAY_WIDTH Eduardo Quezada 2022-08-18 14:02:08 -04:00
  • 27e81b2fc7 UnusedControllerStruct Eduardo Quezada 2022-08-18 12:59:38 -04:00
  • 26e8d57ba1 Special Trainer IDs Eduardo Quezada 2022-08-18 12:58:27 -04:00
  • e37c78c73f Usage of ST_OAM_AFFINE constants Eduardo Quezada 2022-08-18 12:10:09 -04:00
  • 5f81a9834f GetBattlerSpriteCoord and GetBattlerSpriteCoord2 using BATTLER_COORD_* constants Eduardo Quezada 2022-08-18 12:00:13 -04:00
  • 57374b796b Sync src/battle_controllers.c Eduardo Quezada 2022-08-08 10:04:18 -04:00
  • 5813cb43c2 Sync battle anim.c GriffinR 2022-08-17 15:57:46 -04:00
  • ab56ac41a1 Merge branch 'master' into clone-union GriffinR 2022-08-17 15:41:50 -04:00
  • c0b0e87f68 Sync battle anim - status effects GriffinR 2022-08-17 15:14:30 -04:00
  • 4e106d86e3 Sync battle anim - sound tasks GriffinR 2022-08-17 14:44:26 -04:00
  • 8601b4fff3 Sync battle anim - smokescreen GriffinR 2022-08-17 14:27:42 -04:00
  • f476806547 Sync battle anim - rock GriffinR 2022-08-17 14:18:30 -04:00
  • 96ecc82c98 Sync battle anim - poison, psychic GriffinR 2022-08-17 13:52:24 -04:00
  • a1fcfa2f26 Sync battle anim - normal GriffinR 2022-08-17 13:30:22 -04:00
  • efa422d6fa Sync battle anim - mons GriffinR 2022-08-17 13:14:34 -04:00
  • 1711490e16 Sync battle anim - mon movement GriffinR 2022-08-17 12:31:28 -04:00
  • 9552ea6330 Sync battle anim - ice GriffinR 2022-08-16 15:53:59 -04:00
  • 56f8b1a47c Merge pull request #536 from GriffinRichards/sync-data GriffinR 2022-08-17 11:36:07 -04:00
  • 5dc80c492a Merge pull request #532 from AsparagusEduardo/pokefirered_pokeemeraldSync3 GriffinR 2022-08-17 11:29:51 -04:00
  • a67c9aeda6 Merge pull request #539 from GriffinRichards/town-map GriffinR 2022-08-17 11:24:32 -04:00
  • b0acce4fbc Format town map sprite GriffinR 2022-08-17 09:14:58 -04:00
  • 3a0cd4180d Sync battle anim - ground GriffinR 2022-08-16 15:38:51 -04:00
  • ba890e57a4 Sync battle anim - ghost GriffinR 2022-08-16 15:27:42 -04:00
  • 796d307ffb Sync battle anim - fire GriffinR 2022-08-16 15:08:16 -04:00
  • b598507a2e Sync battle anim - fight GriffinR 2022-08-16 14:51:48 -04:00
  • ba6bb34226 Sync battle anim - electric GriffinR 2022-08-16 14:35:37 -04:00
  • 0c74385de7 Sync battle anim - effects 3 GriffinR 2022-08-16 14:12:51 -04:00
  • bcab96fb86 Sync battle anim - effects 2 GriffinR 2022-08-16 13:54:37 -04:00
  • 89774bfdac Merge pull request #538 from cbt6/movement GriffinR 2022-08-16 00:51:01 -04:00
  • 73f8a54aa9 Document remaining movement types and actions cbt6 2022-08-16 12:24:18 +08:00
  • 5135d64501 Review changes Eduardo Quezada 2022-08-15 20:42:34 -04:00
  • f1fddd83f9 Merge pull request #535 from cbt6/movement-action GriffinR 2022-08-15 15:19:20 -04:00
  • b15305378a Sync battle anim - effects 1 GriffinR 2022-08-14 18:56:23 -04:00
  • 2644dd9c21 Merge branch 'master' into movement-action cbt6 2022-08-15 12:54:47 +08:00
  • 102dc65fd1 Sync battle anim - dragon GriffinR 2022-08-14 18:36:29 -04:00
  • 92a193aa71 Sync battle anim - dark GriffinR 2022-08-14 18:30:55 -04:00
  • e4aec1b6d1 Sync battle anim - bug GriffinR 2022-08-14 18:21:03 -04:00
  • 702d43e742 Rename battle anim files GriffinR 2022-08-14 17:52:12 -04:00
  • b3c2c7291f Merge pull request #534 from GriffinRichards/sync-scriptcmds GriffinR 2022-08-14 17:28:52 -04:00
  • 442935bba0 Delete random text file GriffinR 2022-08-12 20:02:49 -04:00
  • 1040b2a66a Restore NUM_LOAF_STRINGS GriffinR 2022-08-12 15:42:26 -04:00
  • a064849864 Sync/document battle_message.c GriffinR 2022-08-12 13:08:40 -04:00
  • 874f1c9832 Sync data.c GriffinR 2022-08-12 11:48:45 -04:00
  • a530bb3a74 Merge pull request #533 from GriffinRichards/sync-naming-screen GriffinR 2022-08-12 10:43:54 -04:00
  • 84d47d2c85 Merge pull request #531 from GriffinRichards/doc-dodrio GriffinR 2022-08-11 14:53:28 -04:00
  • 7233b2ed0a Rename WalkFastest functions to WalkFaster cbt6 2022-08-11 12:21:28 +08:00
  • 84848deb14 Rename movement action funcs cbt6 2022-08-11 12:20:07 +08:00
  • 2a8124ea00 Use movement action constant values over enum cbt6 2022-08-11 12:19:09 +08:00
  • 79ae1e4f14 Use constants for movement speeds cbt6 2022-08-11 12:18:04 +08:00
  • 1d4503ab46 Sync jump movement functions cbt6 2022-08-11 12:17:00 +08:00
  • 2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union GriffinR 2022-08-10 13:48:30 -04:00
  • f113da30ad Use 'goto_if_eq VAR, value, Script' syntax GriffinR 2022-08-09 20:40:03 -04:00
  • 60fc8c5e22 Add remaining event.inc comments GriffinR 2022-08-09 20:27:42 -04:00
  • 3add78dbd1 Use constants for setfieldeffectargument GriffinR 2022-08-09 20:12:26 -04:00
  • fbdbc5851c Add npc text color constants GriffinR 2022-08-09 16:03:42 -04:00
  • 0c1adf2115 Use seteventmon GriffinR 2022-08-09 15:29:16 -04:00
  • 8e7dd94eca Drop some optional script command arguments GriffinR 2022-08-09 15:19:49 -04:00
  • acb480f1c1 Sync event.inc and scrcmd.c GriffinR 2022-08-09 12:57:49 -04:00
  • bf544e84cf Clean up graphics GriffinR 2022-08-09 11:02:04 -04:00
  • 2cda0b61ce Reverted ++ operators not related to battle_util.c, battle_util2.c, or battle_main.c Eduardo Quezada 2022-08-08 16:05:16 -04:00
  • 1e02571269 Sync naming_screen GriffinR 2022-08-07 22:12:00 -04:00
  • ac973aa38d Sync src/battle_util.c with pokeemerald Eduardo Quezada 2022-08-07 22:37:10 -04:00
  • 0e8b639fae Sync dbp - rename files GriffinR 2022-08-07 13:55:50 -04:00