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

168 commits

Author SHA1 Message Date
Eduardo Quezada
a8564cf8a9 Merge branch 'RHH/master' into RHH/upcoming 2023-11-14 12:54:16 -03:00
LOuroboros
87aaeca623
Fixed IS_DITTO macro (#3558) 2023-11-12 10:42:33 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248) 
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
 2023-10-23 12:59:15 +01:00
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Eduardo Quezada D'Ottone
966f89eeb6
pret merge 2023-10-02 (#3372) 2023-10-02 17:37:03 -03:00
Eduardo Quezada D'Ottone
20e3b43f7c
HGSS Style Pokedex (#3288) 2023-10-02 17:28:37 -03:00
Eduardo Quezada
a6940c9e03 Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002 
# Conflicts:
#	src/battle_ai_script_commands.c
#	src/battle_controller_player.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_controllers.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/mystery_gift_menu.c
#	src/pokemon.c
 2023-10-02 17:17:41 -03:00
DizzyEggg
662dd7d2c6
Fix give daycare egg option giving buggy eggs (#3335) 2023-09-22 12:20:00 -03:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Aaghat
daeb2efd46 some minor clean up 2023-09-11 17:55:17 +05:30
Aaghat
6ac16c8c2e More clean up 2023-09-09 10:16:14 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
 2023-08-31 14:28:01 -04:00
GriffinR
4c2b12541b
Merge pull request #1908 from GriffinRichards/name-buffer 
Automatically update nickname buffer sizes
 2023-08-12 23:36:19 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR
65fee186f8 Automatically update nickname buffer sizes 2023-08-08 16:28:09 -04:00
Martin Griffin
0e5c78aeb6 Merge remote-tracking branch 'pret/master' into 'rhh/master' 2023-07-25 19:49:18 +01:00
Martin Griffin
b53cca1a06
Declarations for 2- and 3-argument GetMonData (#1756) 
* Type-safe GetMonData/GetBoxMonData

* Comments
 2023-07-24 09:57:37 -04:00
Eduardo Quezada D'Ottone
84aed50c5b
Manually port daycare expansion to modern standards (#2963) 2023-05-06 21:03:05 -04:00
Bassoonian
f1d60a4a04 Fixed wrong generation in check 2023-04-30 22:52:37 +02:00
Bassoonian
8f75844ece Add Ability inheritance 2023-04-30 12:58:18 +02:00
Bassoonian
21fa91b80b Add ClearHatchedEggMoves per SBird's suggestion 
Co-Authored-By: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-04-30 11:45:24 +02:00
Bassoonian
acf4529d8b Allow Egg Move transfer for non-eggs 2023-04-30 11:25:48 +02:00
Bassoonian
b53c913558 Manually port daycare expansion to modern standards 2023-04-29 18:16:36 +02:00
TheXaman
eaa74ca7cc Merge commit 'f4cb6d229f9c0130f763fa711c8a1f7ef59ac2c9' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2023-03-25 14:49:27 +01:00
Eduardo Quezada
4625a46748 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-03-07 11:26:33 -03:00
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
Eduardo Quezada
101ea6522d Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-02-02 17:56:13 -03:00
Jaizu
767008427f Don't pass down daycare like AlterEggSpeciesWithIncenseItem 2023-01-31 09:47:02 +01:00
Jaizu
68ee9e5739
Restore bugfix 
Ooopsie!
 2023-01-30 13:57:59 +01:00
Jaizu
267cf1e6f0
Update comment 2023-01-29 19:45:43 +01:00
Jaizu
8b1f4ac3ac
Implement Destiny Knot 2023-01-29 19:35:46 +01:00
Eduardo Quezada
3288309c43 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-25 19:57:19 -03:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
Eduardo Quezada
77cc407386 Review change 2023-01-12 23:44:34 -03:00
Eduardo Quezada
1b0ce96e12 Config for ball inheritence when breeding 2023-01-09 02:16:29 -03:00
Eduardo Quezada
612ef46d82 Forgot to add these suggestions 2023-01-08 19:26:34 -03:00
Eduardo Quezada
c5ea97ecc3 Review changes 2023-01-08 18:42:39 -03:00
Eduardo Quezada
9250f8c994 Standarized Pichu/Light Ball/Volt Tackle interaction into their own table, allowing for custom combinations 2023-01-08 18:35:47 -03:00
Eduardo Quezada
339d794324 Fixed compile and made table into struct 2022-12-21 16:46:32 -03:00
Eduardo Quezada
8840d0bbf6 Refactored incense baby checks into table and added Gen 9 config. 2022-12-21 12:31:59 -03:00
Eduardo Quezada
1580f892a5 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/constants/pokemon.h
#	src/battle_script_commands.c
 2022-12-19 18:53:26 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
Eduardo Quezada
7327be6f9e Made Types and Egg Groups into arrays 2022-11-22 17:05:25 -03:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename 
Renamed gBaseStats to gSpeciesInfo
 2022-11-18 17:45:23 -05:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00
Eduardo Quezada
8f289714b2 Moved form change defines and descriptions to their own header 2022-11-05 21:36:45 -03:00
Eduardo Quezada
42f8e8c114 Multiple refactors 
- Added a general GetBattleFormChangeTargetSpecies instead of getting specific ones for Mega Evolution and Primal Reversion.
- Added FORM_CHANGE_BATTLE_HP_PERCENT, to replace ShouldChangeFormHpBased.
- Cleaned ifdefs for hold effects.
- Finally removed UndoMegaEvolution.
- FORM_CHANGE_FAINT and FORM_CHANGE_BATTLE_END restore to the first form before a battle form change if species isn't specified.
- When changing from a form with more HP to one with less, now current HP is kept to fix Zygarde edge case. (Will likely need to be reworked for Dynamax, as it behaves differently)
- Uses DoesSpeciesUseHoldItemToChangeForm in CanBattlerGetOrLoseItem.
 2022-11-05 20:00:12 -03:00