mirror/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-28 13:25:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,108 Commits 3 Branches 0 Tags
f87d86945fc3ef04711dcc9d80956e969cdcf3d4
Commit Graph

4759 Commits

Author SHA1 Message Date
Eduardo Quezada f87d86945f (256/665) 2022-08-17 08:48:38 -04:00
Eduardo Quezada db2d524603 Corrected CopyFrontierBrainTrainerName 2022-08-16 17:22:39 -04:00
Eduardo Quezada 4649d1eddd (234/665) 2022-08-15 14:27:41 -04:00
Eduardo Quezada 11cc2179a4 (205/665) Italian up to date with French 2022-08-12 15:31:25 -04:00
Eduardo Quezada 27f2b85efe Incorporated Italian changes, enough to compile (still needs to sync a couple of them) 2022-08-12 00:28:16 -04:00
Eduardo Quezada ac032cdf9b (202/654) Title screen 2022-08-10 10:59:03 -04:00
Eduardo Quezada c0128e396b Moved french types to their own folder 2022-08-10 09:31:18 -04:00
Eduardo Quezada 06efaeb6df (200!/654) 2022-08-10 09:16:02 -04:00
Eduardo Quezada bb671d90a8 (197/654) 2022-08-10 09:07:13 -04:00
Eduardo Quezada 44ec57c1d5 Berry Blender graphics + Moved Easy Chat 2022-08-09 18:20:17 -04:00
Eduardo Quezada 92eada1251 Bard sounds 2022-08-08 13:01:43 -04:00
Eduardo Quezada fdf99fefb8 Abilities and Ribbon descriptions + fix in strings.c 2022-08-08 12:07:40 -04:00
Eduardo Quezada 860df0bd97 Merge remote-tracking branch 'pret/master' into pret_french 
# Conflicts:
#	ld_script.txt
#	src/battle_controller_player.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/evolution_scene.c
#	src/field_specials.c
#	src/pokedex.c
#	src/union_room.c
 2022-08-08 11:22:44 -04:00
DizzyEggg c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02:00
Eduardo Quezada fa3abf90c4 (148/654) 2022-08-03 11:25:11 -04:00
Eduardo Quezada 58d0fba024 (125/654) 2022-08-02 18:21:19 -04:00
Eduardo Quezada b8dbe69edb (102/654) 2022-08-02 17:11:18 -04:00
Eduardo Quezada c05c6bfe24 (90/654) 2022-08-02 15:44:28 -04:00
Eduardo Quezada f2f74b94d2 (68/654) 2022-08-02 14:03:42 -04:00
GriffinR 79384ec9f3 Merge pull request #1702 from GriffinRichards/clean-psn 
Clean up field_poison.c
 2022-08-02 13:20:49 -04:00
GriffinR 99a37b5aa5 Merge pull request #1717 from mrgriffin/trainer-party-macro 
Macros for keeping .partyFlags, .partySize, and .party in sync
 2022-08-02 13:11:43 -04:00
Eduardo Quezada 1b30bccb47 (56/654) 2022-08-02 12:18:17 -04:00
Eduardo Quezada 4e137fb43c (55/654) src/battle_message.c and adjustments to Makefile 2022-08-02 10:01:19 -04:00
Eduardo Quezada 120a11ac12 54/654, going to bed 2022-08-02 01:08:52 -04:00
Eduardo Quezada 68e7ab9fec 50/654 2022-08-02 00:14:41 -04:00
Eduardo Quezada b2160d50bb 37/654 2022-08-01 23:35:34 -04:00
Eduardo Quezada b49f8c10ad Review changes from https://github.com/pret/pokefirered/pull/525 2022-08-01 15:37:05 -04:00
Eduardo Quezada cc288e3786 Review changes 2022-08-01 15:14:21 -04:00
Eduardo Quezada 7ea49adf3c CpuCopy16 in UnkUtil_CpuRun 2022-08-01 08:04:48 -04:00
Eduardo Quezada a72d4c4168 Cleanup from syncing pss and mon markings 2022-07-30 12:43:14 -04:00
Eduardo Quezada 897b3d07f6 Sync src/pokeball.c with pokefirered 2022-07-29 21:29:12 -04:00
Eduardo Quezada 2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada 2214b01954 Forgot to include this fix 2022-07-29 17:07:56 -04:00
Eduardo Quezada 5d4b76c0ba Review changes from pokefirered #524 2022-07-29 17:00:07 -04:00
Eduardo Quezada 9dc64b67cd Review changes 2022-07-29 15:38:23 -04:00
Eduardo Quezada 01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada 13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada aa93af4083 Fixed check 2022-07-29 10:34:21 -04:00
Eduardo Quezada fa32f337be Review changes 2022-07-29 10:21:20 -04:00
Eduardo Quezada 7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada 9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
Eduardo Quezada 09af7422d5 Further cleaning after comparing with pokefirered 
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
 2022-07-28 01:27:05 -04:00
Eduardo Quezada dc47a959da Reverted comments from pokefirered 2022-07-27 20:33:34 -04:00
Eduardo Quezada b00bd8b181 Cleaned by comparing evolution_scene.c with pokefirered 2022-07-27 18:51:32 -04:00
Martin Griffin 2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01:00
GriffinR 4ffe75c611 Merge pull request #1707 from GriffinRichards/use-pocket-consts 
Add some missing pocket constant usage
 2022-07-27 12:22:01 -04:00
GriffinR 1da46a4bbc Merge pull request #1715 from AsparagusEduardo/pret_docBooleans 
Documented boolean uses
 2022-07-27 12:09:02 -04:00
GriffinR 5366e89258 Merge pull request #1713 from DizzyEggg/patch-1 
Change GAME_LANGUAGE to LANGUAGE_ENGLISH
 2022-07-26 11:08:05 -05:00
DizzyEggg b7c78571a6 Update src/international_string_util.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-07-26 15:39:29 +02:00
DizzyEggg c557c4eb27 Add a comment 2022-07-26 14:44:53 +02:00