Commit Graph

3563 Commits

Author SHA1 Message Date
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
GriffinR
84d47d2c85
Merge pull request #531 from GriffinRichards/doc-dodrio
Sync dodrio berry picking
2022-08-11 14:53:28 -04:00
cbt6
7233b2ed0a Rename WalkFastest functions to WalkFaster 2022-08-11 12:21:28 +08:00
cbt6
84848deb14 Rename movement action funcs 2022-08-11 12:20:07 +08:00
cbt6
2a8124ea00 Use movement action constant values over enum 2022-08-11 12:19:09 +08:00
cbt6
79ae1e4f14 Use constants for movement speeds 2022-08-11 12:18:04 +08:00
cbt6
1d4503ab46 Sync jump movement functions 2022-08-11 12:17:00 +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
GriffinR
bf544e84cf Clean up graphics 2022-08-09 11:13:40 -04:00
Eduardo Quezada
2cda0b61ce Reverted ++ operators not related to battle_util.c, battle_util2.c, or battle_main.c 2022-08-08 16:05:16 -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
25344d1bbd
Merge pull request #530 from cbt6/sym-gitignore
Add symbol files to .gitignore
2022-08-07 01:13:24 -04:00
cbt6
2fc9d5670f Add symbol files to .gitignore 2022-08-07 12:58:00 +08:00
GriffinR
12fdf455ce Merge dodrio_berry_picking 1 and 2, sync function names 2022-08-06 20:40:11 -04:00
GriffinR
e46d7d4bca
Merge branch 'master' into format-obj 2022-08-06 18:36:52 -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
bc5426a3c6
Merge pull request #528 from GriffinRichards/doc-behaviors
Document metatile behaviors
2022-08-06 02:45:30 -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
GriffinR
40cbfc0722
Merge pull request #526 from cbt6/save
Document src/save.c
2022-08-05 08:18:37 -04:00
cbt6
686c8383e5 Document src/save.c 2022-08-05 14:18:53 +08:00
GriffinR
49ea462d7f
Merge pull request #525 from AsparagusEduardo/pokefirered_pokeemeraldSync2
2nd batch of syncing with pokeemerald
2022-08-01 16:56:48 -04: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
Eduardo Quezada
36a5761d36 PSS sync 2022-07-31 22:39:59 -04:00
Eduardo Quezada
9d9c2a9667 Combining pss 8 and 9 2022-07-31 22:02:44 -04:00
Eduardo Quezada
2d2d17dde3 Sync pokemon_storage_system_8.c 2022-07-31 21:41:39 -04:00
Eduardo Quezada
95dd979f09 Font constants and slight PSS sync 2022-07-31 21:00:27 -04:00
Eduardo Quezada
bcfebc7de4 Review changes 2022-07-30 13:11:02 -04:00
Eduardo Quezada
60ce72fa5a Synced src/mon_markings.c and partly synced PSS 2022-07-30 12:29:20 -04:00
GriffinR
f5c4a07d56
Merge pull request #524 from AsparagusEduardo/pokefirered_pokeemeraldSync
Sync with pokeemerald
2022-07-30 09:07:28 -04:00
Eduardo Quezada
4a60396428 Colors 2022-07-29 22:49:52 -04:00