Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 12:26:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,108 Commits 3 Branches 0 Tags
f87d86945fc3ef04711dcc9d80956e969cdcf3d4
Commit Graph

7108 Commits

This Branch
This Branch
All Branches
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
d45fda5666 (241/665) 2022-08-16 14:30:29 -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
9f23159c43 (185/654) 2022-08-08 15:52:16 -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
GriffinR
aa9ccbf194 Merge pull request #1724 from DizzyEggg/lang_improvements 
Accomodate some parts of code based on the french decomp
 2022-08-04 21:37:19 -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
18cdd708b5 (56/654) Berry fix gba file + finalizing format for inc files 2022-08-02 11:05:56 -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
6b8d17497f Finished the rest of the Abandoned Ship text 2022-08-01 18:30:55 -04:00
Eduardo Quezada
a59b1fb9d2 First pair 2022-08-01 17:53:15 -04:00
Eduardo Quezada
bec4127e20 Added missing makefile changes 2022-08-01 17:41:25 -04:00
GriffinR
79c5a5983e Merge pull request #1721 from AsparagusEduardo/pret_clean2 
Companion PR to pokefirered #525
 2022-08-01 16:57:40 -04:00
Eduardo Quezada
62b81fea84 Setting up french makefile 2022-08-01 16:16:52 -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
GriffinR
5101811407 Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands 
Further cleaning after comparing with pokefirered
 2022-07-30 09:09:23 -04:00
Eduardo Quezada
897b3d07f6 Sync src/pokeball.c with pokefirered 2022-07-29 21:29:12 -04:00
Eduardo Quezada
40805fffc0 Space cleanup 2022-07-29 21:28:39 -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