atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11256 commits 2 branches 40 tags 600 MiB
Commit graph

2021 commits

Author SHA1 Message Date
Eduardo Quezada
486a836034 Platinum and HGSS forms 2022-09-08 17:37:14 -04:00
Eduardo Quezada
f30605822c Arceus DP 2022-09-08 16:17:12 -04:00
Eduardo Quezada
6cae7a74d3 Cherrim, Shellos and Gastrodon 2022-09-08 16:16:28 -04:00
Eduardo Quezada
b4f99294e1 Normal form defines 2022-09-08 14:41:07 -04:00
Eduardo Quezada
e132eff850 Finished with Gen 3 forms 2022-09-08 12:15:38 -04:00
Eduardo Quezada
836fabc992 IDs aligned + fixed Zygarde 2022-09-08 10:13:28 -04:00
Eduardo Quezada
ca14a46215 Moved Unown forms 2022-09-08 09:56:45 -04:00
Eduardo Quezada
7fe1e706b7 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
Eduardo Quezada
e253a87bc5 Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once. 2022-09-05 14:49:14 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
TheXaman
6cab795c5c
Update include/constants/overworld_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:02:44 +02:00
Eduardo Quezada
89550ed05d Updated Sport Ball's modifier. 2022-09-04 18:54:23 -03:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
TheXaman
b4b3e84cbd removed default flags and added ingame warning if a function that requires them is used 2022-09-02 18:39:38 +02:00
TheXaman
367b12801e changed debug_config.h to overworld_config.h, 
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
 2022-09-02 12:33:42 +02:00
TheXaman
ad57551db1 removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04:00
TheXaman
3debf0442d changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h' 2022-08-30 18:02:23 +02:00
TheXaman
04c40677bd Changed the way debug flags are handled, now in constants/battle_config.h 2022-08-30 17:41:35 +02:00
TheXaman
8c9a59ec1c Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh 2022-08-29 19:13:11 +02:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework 
Reworked TMHM into expandable list format
 2022-08-29 04:20:45 -04:00
Eduardo Quezada
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection 
Implement affection-now-friendship mechanics
 2022-08-26 14:54:32 -04:00
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy 
Gen 8 EXP Candies
 2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-25 22:40:19 -04:00
crater-git
ed02c4b425 Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43 changed candy item parameters 2022-08-25 15:52:47 -07:00
LOuroboros
2cf2c00b29 Updated friendship labels 2022-08-25 17:10:11 -03:00
ghoulslash
552d1f3d7b
Merge pull request #2237 from gruxor/compat_define 
Reworked branch defines into single compatibility define
 2022-08-25 15:36:01 -04:00
LOuroboros
5dd143f19d Applied Blackforest's changes to General_AffectionHangedOn 2022-08-25 13:07:52 -03:00
LOuroboros
1fc63c3431 More review corrections 2022-08-25 11:52:21 -03:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
LOuroboros
e792fae415 Review corrections 
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
 2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03:00
ghoulslash
f736766c94
Merge pull request #2238 from DizzyEggg/multi 
Wild multi battles and doubles 2 vs 1 interface
 2022-08-25 08:47:02 -04:00
LOuroboros
7b7ba93d45 Fixed P_UPDATED_ABILITIES's comment 2022-08-24 20:35:13 -03:00
crater-git
940f9f1726 Moved branch defs to config.h, now only for compat 2022-08-24 16:10:32 -04:00