Commit Graph

3444 Commits

Author SHA1 Message Date
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 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
Eduardo Quezada dcb9d9de1e Synced src/pokeball.c 2022-07-29 21:39:25 -04:00
Eduardo Quezada c40791fd4e SPRITE_INVALID_TAG -> TAG_NONE 2022-07-29 18:37:43 -04:00
Eduardo Quezada dfe6c6885c Synced sound.c 2022-07-29 18:15:25 -04:00
Eduardo Quezada 78e3780fa4 And this one 2022-07-29 17:09:04 -04:00
Eduardo Quezada 65baf962c5 Forgot to include this fix 2022-07-29 17:07:26 -04:00
Eduardo Quezada e0010b9205 Reverted FONT_SMALL 2022-07-29 17:04:04 -04:00
Eduardo Quezada c97e88b437 Review changes 2022-07-29 16:57:13 -04:00
Eduardo Quezada 4c9e831a05 Standarized use of star in void and struct pointers 2022-07-29 11:20:00 -04:00
Eduardo Quezada 4998b976e1 Standarized use of star in pointer types 2022-07-29 10:35:48 -04:00
Eduardo Quezada 94fc3ca044 Fixed check 2022-07-29 10:30:12 -04:00
Eduardo Quezada 53fc50229f Review changes from pokeemerald #1719 2022-07-29 10:21:59 -04:00
Eduardo Quezada 7f53f533bb Synced src/battle_script_commands.c 2022-07-29 09:42:03 -04:00
Eduardo Quezada 0709da5867 Multiple changes 2 2022-07-28 01:20:05 -04:00
Eduardo Quezada f5e9cc595b Multiple changes
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
2022-07-27 18:14:48 -04:00