Commit Graph

1569 Commits

Author SHA1 Message Date
GriffinR
dcdf31f020 Sync fieldmap 2022-09-02 19:24:59 -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
17b2faa182 Sync battle anim - scripts 2022-08-19 01:07:53 -04:00
GriffinR
a3c2108af7 Sync battle anim - flying, header cleanup 2022-08-18 14:20:25 -04:00
GriffinR
5813cb43c2 Sync battle anim.c 2022-08-17 15:57:46 -04:00
GriffinR
c0b0e87f68 Sync battle anim - status effects 2022-08-17 15:14:30 -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
efa422d6fa Sync battle anim - mons 2022-08-17 13:14:34 -04:00
GriffinR
9552ea6330 Sync battle anim - ice 2022-08-17 12:18:06 -04:00
GriffinR
56f8b1a47c
Merge pull request #536 from GriffinRichards/sync-data
Sync data.c
2022-08-17 11:36:07 -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
ba890e57a4 Sync battle anim - ghost 2022-08-16 15:27:42 -04:00
GriffinR
796d307ffb Sync battle anim - fire 2022-08-16 15:15:07 -04:00
GriffinR
b598507a2e Sync battle anim - fight 2022-08-16 14:51:48 -04:00
GriffinR
ba6bb34226 Sync battle anim - electric 2022-08-16 14:35:37 -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
73f8a54aa9 Document remaining movement types and actions 2022-08-16 12:24:18 +08:00
GriffinR
b15305378a Sync battle anim - effects 1 2022-08-15 15:17:18 -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
b3c2c7291f
Merge pull request #534 from GriffinRichards/sync-scriptcmds
Sync script commands
2022-08-14 17:28:52 -04:00
GriffinR
1040b2a66a Restore NUM_LOAF_STRINGS 2022-08-12 15:42:26 -04:00
GriffinR
a064849864 Sync/document battle_message.c 2022-08-12 13:58:24 -04:00
GriffinR
874f1c9832 Sync data.c 2022-08-12 12:07:43 -04:00
GriffinR
a530bb3a74
Merge pull request #533 from GriffinRichards/sync-naming-screen
Sync naming screen
2022-08-12 10:43:54 -04:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
GriffinR
fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR
acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
GriffinR
bf544e84cf Clean up graphics 2022-08-09 11:13:40 -04:00
GriffinR
1e02571269 Sync naming_screen 2022-08-08 12:05:30 -04:00
Eduardo Quezada
ac973aa38d Sync src/battle_util.c with pokeemerald 2022-08-07 22:37:10 -04:00
GriffinR
0e8b639fae Sync dbp - rename files 2022-08-07 13:55:50 -04:00
GriffinR
77e6f75509 Sync dbp - comm funcs 2022-08-07 13:47:22 -04:00
GriffinR
bc62f128ab Sync dbp - function bodies 2022-08-07 13:28:05 -04:00
GriffinR
76adc777bf Sync dbp - struct members 2022-08-07 01:40:12 -04:00
GriffinR
d6d5290099
Merge pull request #527 from GriffinRichards/sync-more-save
Sync save sector checks
2022-08-06 18:22:56 -04:00
GriffinR
3fd7e08ae1
Merge pull request #529 from GriffinRichards/rename-viridian
Rename Viridian City houses
2022-08-06 12:53:54 -04:00
GriffinR
507b284353 Celadon water -> cycling road water 2022-08-06 02:31:19 -04:00
GriffinR
daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
GriffinR
1640f8b835 Document metatile behaviors 2022-08-05 15:27:08 -04:00
GriffinR
f16b6100c8 Sync save sector checks 2022-08-05 11:49:17 -04:00
cbt6
686c8383e5 Document src/save.c 2022-08-05 14:18:53 +08:00
Eduardo Quezada
b1bc05ec05 Review changes 2022-08-01 15:37:00 -04:00
Eduardo Quezada
95b16a2391 Review changes from https://github.com/pret/pokeemerald/pull/1721 2022-08-01 15:18:37 -04:00
Eduardo Quezada
19a521fe33 Almost complete battle_scripts_1.s sync 2022-08-01 01:05:18 -04:00