637 Commits

Author	SHA1	Message	Date
AgustinGDLV	2eabcea86e	Battle Item Refactor (#2902) ... * items that can be used in battle now use battlescripts * removed ExecuteTableBasedItemEffect_ * taught AI how to use items, removed AI_itemtype/flag * X-Items store stages raised in holdEffectParam * USE_ITEM in tests	2023-04-14 19:25:50 +01:00
aaghaht	bd54c70020	Add PLA evo items	2023-04-10 10:47:31 +05:30
Eduardo Quezada D'Ottone	2658fe32c2	Removed ITEM_HAS_EFFECT (#2840)	2023-03-23 10:02:32 +01:00
Eduardo Quezada D'Ottone	023cc4d38d	Fixed erroneous uses of non e-reader Enigma Berries (#2839)	2023-03-23 09:58:26 +01:00
Eduardo Quezada	51b716c9d9	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 ... # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h	2023-03-19 20:28:56 -03:00
Alex	aa29eced1f	Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites	2023-03-13 17:46:53 +01:00
GriffinR	4d99d2c926	Merge pull request #1859 from AsparagusEduardo/pret/doc/natures ... Reformatted gNatureStatTable	2023-03-04 23:31:43 -05: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
GriffinR	ec89e519f9	Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful ... Rename eventLegal to modernFatefulEncounter	2023-02-28 11:48:34 -05:00
GriffinR	8d88a38561	Merge pull request #1854 from GriffinRichards/constants-num-frames ... Add MAX_MON_PIC_FRAMES, and trainer pic size constants	2023-02-27 13:16:49 -05:00
Eduardo Quezada	079ca8ab29	Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification	2023-02-24 07:53:02 -03:00
Alex	a870ec3c22	enamorus_t cry, basculegionf sprite, new typhlosion back sprite	2023-02-23 15:20:12 +01:00
Eduardo Quezada	bd54990333	Review changes	2023-02-15 13:56:11 -03:00
Eduardo Quezada	d699d55ba3	Reformatted gNatureStatTable	2023-02-12 01:19:03 -03:00
Eduardo Quezada	96865f66af	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
Eduardo Quezada	6da5e0a280	Rename eventLegal to fatefulEncounter	2023-02-11 17:13:53 -03:00
GriffinR	3b15fd34cc	Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames	2023-02-01 16:09:01 -05:00
Martin Griffin	f1b9872bf0	Test moves, items, and abilities in battle ... Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic Spikes tests! Co-authored-by: sbird <sbird@no.tld>	2023-02-01 13:53:57 +00: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 D'Ottone	7622d84a4f	Revert "Removed Unown hack"	2023-01-07 11:39:56 -03:00
Eduardo Quezada	74d8c587fe	Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown ... # Conflicts: # src/data/pokemon/species_info.h # src/data/pokemon_graphics/front_pic_anims.h	2023-01-04 17:58:54 -03:00
ghoulslash	2944ebfe7b	Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances ... Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2023-01-02 13:55:36 -05:00
Eduardo Quezada	1fc86e52b5	Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2022-12-27 21:18:20 -03:00
Eduardo Quezada D'Ottone	263ed33755	Fixed Eggs sometimes reading garbage graphic data.	2022-12-26 11:56:27 -03:00
Eduardo Quezada	9d1149c423	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # src/pokemon.c	2022-11-29 17:40:09 -03:00
Eduardo Quezada	4bac880042	Removed Unown hack	2022-11-25 16:55:53 -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
Eduardo Quezada	540f4679bb	Implemented uses of Shiny config	2022-11-14 11:56:02 -03:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
Eduardo Quezada	d23b5c95c9	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations ... # Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c	2022-11-03 23:31:20 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
Eduardo Quezada	14e85249d1	Review changes	2022-10-30 17:12:13 -03:00
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ... # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
Eduardo Quezada	3ed485632f	Renamed gBaseStats to gSpeciesInfo	2022-10-24 17:01:48 -03:00
BuffelSaft	d9cc98a4fe	Suggested changes ... - Various style fixes - Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle	2022-10-24 22:19:35 +13:00
GriffinR	60e1ad20e4	Add NUM_MON_PIC_FRAMES, and trainer pic size constants	2022-10-10 23:16:08 -04:00
Eduardo Quezada D'Ottone	2ce340e8e1	Merge pull request #2262 from LOuroboros/becomingAHero ... Fixed Mega Evolved Pokémon being able to get Friendship effects in battle	2022-10-07 18:27:29 -03:00
Eduardo Quezada	9b977486fe	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/base_stats.h	2022-10-07 14:05:45 -03:00
LOuroboros	02c6bc64b2	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero	2022-10-07 12:20:52 -03:00
ghoulslash	441586f23f	Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags ... 4 new species flags	2022-10-07 10:55:43 -04:00
Eduardo Quezada	d24899369f	Special handling for Mew's Teachable moveset	2022-09-28 09:04:31 -03:00
Eduardo Quezada	3d214f8204	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-27 10:13:32 -03:00
Eduardo Quezada D'Ottone	681ad8c7a9	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h	2022-09-18 18:25:05 -03:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Eduardo Quezada D'Ottone	7825153bb2	Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix ... Exp Candy Fixes	2022-09-15 22:46:59 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
Eduardo Quezada	0944232059	Added shiny rerolls to Lures + reverted repel var name	2022-09-12 10:21:57 -03:00
Eduardo Quezada	66177e7958	Reworked shiny charm rerolls allow adding additional rerolls when necessary	2022-09-12 10:21:21 -03:00