Commit Graph

1325 Commits

Author SHA1 Message Date
GriffinR c77adaf6bf Sync map data macros 2022-10-25 14:31:01 -04:00
GriffinR 32ab6087d8 Merge pull request #484 from GriffinRichards/clone-union
Separate connection clone objects from normal objects
2022-10-17 21:29:52 -04:00
GriffinR 5dfc494c00 Convert tilesets.s to C 2022-10-08 03:54:27 -04:00
GriffinR 7b2da8e402 Sync/document the rest of strings.c 2022-09-13 14:48:54 -04:00
GriffinR bfd1fb2419 MAP_NONE -> MAP_DYNAMIC, treat warp ids as strings to allow constants 2022-09-03 14:59:18 -04:00
GriffinR 0400ee2124 Merge branch 'master' into clone-union 2022-09-03 14:31:04 -04:00
GriffinR ccd527b782 Merge pull request #542 from GriffinRichards/sync-cableclub
Sync cable club
2022-09-03 14:27:13 -04:00
GriffinR 56fead7d16 Merge pull request #543 from Jaizu/common_movement_naming
Add Common_ to movements.inc
2022-09-03 14:20:33 -04:00
GriffinR 76ec1837aa Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub 2022-09-03 14:19:50 -04:00
GriffinR 17a8498701 Fix battle message charmap copied from emerald 2022-08-30 14:07:57 -04:00
Jaizu ce612de462 Add Common_ to movements.inc 2022-08-28 16:51:45 +02:00
GriffinR 321f5371d8 Sync cable club 2022-08-25 18:48:54 -04:00
GriffinR feccd302d7 Merge pull request #540 from GriffinRichards/sync-b-anim
Sync battle anim
2022-08-25 10:09:32 -04:00
GriffinR b06d2045fc Script_HeartIcon -> Script_XIcon 2022-08-24 18:17:18 -04:00
GriffinR da955aaf64 Document safari reactions, move b string ids to constants 2022-08-23 11:11:50 -04:00
GriffinR a5853a71bd Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-23 10:47:07 -04:00
GriffinR feb3d9cbab Merge pull request #537 from GriffinRichards/doc-bmsg
Sync/document battle_message.c
2022-08-23 10:45:48 -04:00
GriffinR b3590324b8 Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim 2022-08-19 11:30:00 -04:00
GriffinR c976547c02 Clean up FRLG-specific anim scripts 2022-08-19 10:11:39 -04:00
GriffinR 17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR 5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR ab56ac41a1 Merge branch 'master' into clone-union 2022-08-17 15:41:50 -04:00
GriffinR c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -04:00
GriffinR 4e106d86e3 Sync battle anim - sound tasks 2022-08-17 14:44:26 -04:00
GriffinR 8601b4fff3 Sync battle anim - smokescreen 2022-08-17 14:29:23 -04:00
GriffinR a1fcfa2f26 Sync battle anim - normal 2022-08-17 13:30:22 -04:00
GriffinR 9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -04:00
GriffinR 5dc80c492a Merge pull request #532 from AsparagusEduardo/pokefirered_pokeemeraldSync3
Sync src/battle_util.c with pokeemerald
2022-08-17 11:29:51 -04:00
GriffinR 0c74385de7 Sync battle anim - effects 3 2022-08-16 14:23:32 -04:00
GriffinR bcab96fb86 Sync battle anim - effects 2 2022-08-16 13:54:37 -04:00
cbt6 2644dd9c21 Merge branch 'master' into movement-action 2022-08-15 12:54:47 +08:00
GriffinR 92a193aa71 Sync battle anim - dark 2022-08-14 18:30:55 -04:00
GriffinR 702d43e742 Rename battle anim files 2022-08-14 18:02:16 -04:00
GriffinR a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
cbt6 7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
GriffinR 2b93687ade Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union 2022-08-10 13:48:30 -04:00
GriffinR f113da30ad Use 'goto_if_eq VAR, value, Script' syntax 2022-08-09 20:41:54 -04:00
GriffinR 60fc8c5e22 Add remaining event.inc comments 2022-08-09 20:27:42 -04:00
GriffinR 3add78dbd1 Use constants for setfieldeffectargument 2022-08-09 20:12:26 -04:00
GriffinR fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR 0c1adf2115 Use seteventmon 2022-08-09 15:29:16 -04:00
GriffinR 8e7dd94eca Drop some optional script command arguments 2022-08-09 15:25:44 -04:00
GriffinR acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
Eduardo Quezada ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
Eduardo Quezada 19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00
Eduardo Quezada 95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada 7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00