Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-28 04:46:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,095 Commits 3 Branches 0 Tags
fdf99fefb8770dfdefc8bc1b38b0dd5a0244f7b7
Commit Graph

7095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
GriffinR
591eef550e Merge pull request #1720 from Jaizu/patch-25 
Remove duplicated CB2_InitCopyrightScreenAfterBootup
 2022-07-29 06:56:35 -04:00
Jaizu
7a8c28ccca Remove duplicated CB2_InitCopyrightScreenAfterBootup 2022-07-29 10:52:36 +02: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
GriffinR
456d45985f Merge pull request #1718 from AsparagusEduardo/pret_cleanEvoScene 
Cleaned by comparing evolution_scene.c with pokefirered
 2022-07-27 21:54:34 -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