1730 commits

Author	SHA1	Message	Date
Eduardo Quezada	ecad6ff0db	Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2	2022-09-27 10:46:49 -03:00
Eduardo Quezada	fb9105f8ac	Added Mega Evolution flag	2022-09-27 10:21:26 -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	dfdfb72365	Separate config for updated move types	2022-09-26 07:50:43 -03:00
GriffinR	f0744641d1	Merge pull request #1651 from garakmon/entry_json ... use json for region map sections	2022-09-25 21:56:09 -04:00
GriffinR	171367d66c	Merge pull request #1643 from cbt6/object-event-graphics-info ... Format object event graphics info	2022-09-25 21:55:22 -04:00
GriffinR	56c28fb2dd	Move region map gitignore to existing data gitignore	2022-09-25 18:15:16 -04:00
GriffinR	e473aaf783	Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json	2022-09-25 18:10:04 -04:00
GriffinR	7223dbd62f	Merge branch 'master' into rme-update	2022-09-25 11:56:57 -04:00
Eduardo Quezada	f969effd36	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone	d59d8b92af	Merge branch 'dev' into AI	2022-09-24 11:07:09 -03:00
GriffinR	1107ff954d	Clean up shop.c	2022-09-22 15:08:17 -04:00
GriffinR	9bcc36fe08	Merge pull request #1767 from GriffinRichards/trainer-pals ... Generate trainer pic palettes from image	2022-09-22 11:34:03 -04: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	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -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	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch ... Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
ghoulslash	6cfacb396e	Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount ... Automated creation of MAP_GROUP_COUNT for the debug menu	2022-09-15 18:01:05 -04:00
Eduardo Quezada	41d11b0708	Restored filename format for gendered species	2022-09-14 11:13:42 -03:00
Eduardo Quezada	ee628de82f	Config to turn off Hippopotas' and Hippowdon's female icons	2022-09-13 21:42:53 -03:00
Eduardo Quezada	0caf79f702	Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 ... # Conflicts: # graphics/pokemon/cherrim/anim_front.png # graphics/pokemon/scyther/anim_front.png # graphics/pokemon/scyther/front.png # graphics/pokemon/shinx/anim_front.png # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/front_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-09-13 20:44:49 -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	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	69f01d73cd	Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-11 12:41:56 -04:00
Jaizu	0daeee83f3	Fix Lure prices ... This change reflects the original prices used in Pokémon let's go pikachu/eevee	2022-09-11 18:06:05 +02:00
Eduardo Quezada	4b1aca19cb	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_controller_link_opponent.c # src/battle_controller_opponent.c # src/battle_controller_recorded_opponent.c # src/battle_controllers.c # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/pokemon.c	2022-09-10 00:17:03 -04:00
Eduardo Quezada	a462db5e69	Automated creation of MAP_GROUP_COUNT for the debug menu	2022-09-09 23:34:05 -04:00
Eduardo Quezada	5e399955d5	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations	2022-09-09 17:37:23 -04:00
LOuroboros	12fee71008	Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE	2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone	69d3fafdcf	Merge pull request #2273 from LOuroboros/zazaForms ... Introduced FORM_BATTLE form changes	2022-09-09 14:15:53 -04:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Eduardo Quezada	8449f237c2	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-09 09:02:35 -04:00
Eduardo Quezada	21df8c279b	Added SPECIES_FLAG_CANNOT_BE_TRADED ... - Also corrected Cylarex's forms not having the legendary flag	2022-09-09 08:59:53 -04:00
Eduardo Quezada	1fa9bc1b5c	Adjusted style of coords tables	2022-09-08 18:32:01 -04:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07: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	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
LOuroboros	a7a1ab9aeb	Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD ... There was never a reason not to.	2022-09-06 19:20:11 -03:00
LOuroboros	f1c153e469	Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD ... There was never a reason not to.	2022-09-06 18:37:16 -03:00
Eduardo Quezada	12bb32666b	Aligned FRONTIER_MONS trainer macros with the rest for consistency	2022-09-06 17:05:56 -04:00
Eduardo Quezada	7a0838a0f2	Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table	2022-09-06 10:53:18 -03:00
LOuroboros	0b07f4a06e	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms	2022-09-06 10:53:12 -03:00
LOuroboros	bb290d5ab0	Updates ... -Removed the pointless param1 setting in sXerneasFormChangeTable -Updated the descriptions of Behemoth Blade and Behemoth Bash -Added a new parameter to the struct FormChange -Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves". -Added missing calls to "CalculateMonStats". -Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake -Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.) Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.	2022-09-06 10:45:07 -03:00
GriffinR	c8afeea182	Generate trainer pic palettes from image	2022-09-05 16:09:45 -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
tustin2121	33f10d2139	Adding missing externs ... If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.	2022-09-05 09:49:20 -04:00
Eduardo Quezada	d699ea3334	Fixed macro alignments	2022-09-05 08:38:35 -04:00
Eduardo Quezada	2ee843c70d	Proper label for species flags	2022-09-04 22:13:28 -03:00
Eduardo Quezada D'Ottone	c58dfa63a1	Merge remote-tracking branch 'RHH/master' into PE_monAnimations ... # Conflicts: # src/pokemon.c	2022-09-02 12:06:43 -04:00
LOuroboros	b9a32a93f5	Update src/data/text/move_descriptions.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-08-31 23:39:59 -03:00
LOuroboros	7b8226a8af	Added descriptions for LA's moves	2022-08-30 23:05:22 -03:00
LOuroboros	cc86b2fd96	Added Z-Move stats for LA's moves	2022-08-30 20:29:36 -03: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	e9a5442be5	Removed unused ITEM_EXPANSION constants from base stats	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
LOuroboros	df88317a98	Introduced FORM_BATTLE form changes ... For species such as Xerneas and Zacian.	2022-08-29 19:10:52 -03:00
Blackforest92	b209645b20	Changes Origin to Origin Forme	2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone	32a1017c2d	Fixed tab	2022-08-29 10:13:01 -04: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
Blackforest92	d6998d4579	Edited PLA' pokedex_text.h	2022-08-28 19:55:45 +07: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
crater-git	f8fb4e8cf2	Renamed funcs, lists, etc. - Teach->Teachable	2022-08-26 14:48:06 -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
ghoulslash	591bac25c4	Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves ... Moves with EFFECT_PLACEHOLDER can't be used.	2022-08-25 15:34:23 -04:00
crater-git	1ff5bdca9d	Added list endings to otherwise empty learnsets	2022-08-24 11:55:39 -04:00
Blackforest92	fb00ac977a	Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish	2022-08-24 16:21:45 +07:00
Blackforest92	07a07ddc8d	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone	21867a6061	Merge branch 'master' into AI	2022-08-24 01:07:35 -04:00
Eduardo Quezada D'Ottone	21fe205f0f	Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes ... Fix multiple pokemon icons & tidying pokemon graphic folders	2022-08-24 00:52:49 -04:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
crater-git	7ac2f566fd	Re-added PP if statements for P_NEW_POKEMON	2022-08-23 23:08:38 -04:00
crater-git	45511fcc44	Reworked TMHM into expandable list format	2022-08-23 21:44:42 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
DizzyEggg	05ec8fb182	AI knows Party mons	2022-08-23 11:58:17 +02:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate ... # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.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_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock ... Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs ... Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	81ef818f61	Merge pull request #1731 from GriffinRichards/missing-tag ... Move party menu data constants	2022-08-20 22:43:52 -04:00
Blackforest92	2b512a8e03	Fix Voltorb and Exeggutor' form species table	2022-08-19 18:14:11 +07:00
Blackforest92	346f3b7f4c	Fix PLA's base_stats.h (rename .item2 to .itemRare)	2022-08-19 18:01:28 +07:00
Blackforest92	a9d09bcd17	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion	2022-08-19 17:53:01 +07:00
Blackforest92	00a827b3fb	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
Eduardo Quezada	5933c42439	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	f534e8e44a	Move party menu data constants	2022-08-10 14:30:01 -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
ExpoSeed	49da2ee53f	Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION	2022-08-02 00:15:55 -05:00
Eduardo Quezada	c6cdb2a281	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-31 22:57:46 -04:00
Eduardo Quezada D'Ottone	22ab78e2f8	Fixed Steam Eruption's long name	2022-07-30 00:10:20 -04:00
Eduardo Quezada	2e1bf0d965	OamData mosaic FALSE	2022-07-29 21:27:39 -04:00
Greenphx9	05cbd6a906	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names	2022-07-29 18:49:25 +10:00
Martin Griffin	2380d13a43	Macros for keeping .partyFlags, .partySize, and .party in sync	2022-07-27 23:25:37 +01:00
Eduardo Quezada	e96c9c87fa	Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 23:38:52 -04:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	cef730e451	Merge pull request #2196 from AsparagusEduardo/IE_pretmerge ... Item Expansion pret merge	2022-07-22 14:01:50 -04:00
ghoulslash	0588bba193	Merge pull request #2195 from AsparagusEduardo/PE_pretmerge ... Pokémon Expansion pret merge	2022-07-22 14:01:27 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Blackforest92	56f4c319a4	Fix multiple pokemon graphics, tidying pokemon graphic folders	2022-07-22 22:17:29 +07:00
Eduardo Quezada D'Ottone	25397e5794	Fixed Light That Burns The Sky not using the calculated damage category ... Also: - Modified move defines to ease with future move expansion. - Enabled Instruct's check for Z Moves in AI_CheckBadMove.	2022-07-21 15:13:00 -04:00
ghoulslash	462a144956	Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power ... Updated Z-Move power for Gen 8 moves and moves with power varying by Gen	2022-07-20 18:10:31 -04:00
AgustinGDLV	9c73cb322e	replaced bitfield with LUT	2022-07-20 10:48:09 -07:00
Eduardo Quezada D'Ottone	f00beac3f9	Updated Z-Move power for Gen 8 moves and moves with power varying by Gen	2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
sphericalice	65db9238e8	Give Pikachu its typing back	2022-07-18 09:41:04 +01:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
ExpoSeed	da4d1bc626	Merge pull request #2176 from LOuroboros/patch-1 ... Fixed Pokéblock Case's description	2022-07-16 03:35:26 -05:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 ... # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
LOuroboros	cec7e30ef1	Update battle_moves.h	2022-07-15 01:51:36 -03:00
Eduardo Quezada D'Ottone	f78bb4fb84	Merge remote-tracking branch 'pret/master' into item_expansion ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge ... # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
Greenphx9	4294682d8c	16-letter move names ... Move define, add spaces between comments, fix include if TRUE -> if set to TRUE Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>	2022-07-11 12:49:30 +10:00
LOuroboros	640974b164	Update items.h	2022-07-05 22:13:15 -03:00
Blackforest92	ff861ff963	Add some of Legends Arceus battle sprites	2022-07-04 12:28:40 +07:00
LOuroboros	3c9be7c3b2	Fixed Pokéblock Case's description	2022-07-03 13:36:00 -03:00
Blackforest92	8c88e8a9b7	Legends Arceus Pokemon 95% Finished	2022-07-03 17:15:37 +07:00
ghoulslash	fc2cfd8c9d	Merge pull request #2136 from LOuroboros/pePretMerge ... Pret merge for the pokemon_expansion	2022-07-01 09:22:55 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge ... Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
GriffinR	277750b088	Merge branch 'master' into rme-update	2022-06-22 10:02:17 -04:00
GriffinR	7143865f6f	Add some battle frontier constant usage	2022-06-09 12:57:28 -04:00
sneed	c8e08edbae	rename item1 and item2 in BaseStats	2022-05-23 19:10:24 +03:00
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	248863239b	repair sawssuck abilities	2022-05-23 04:10:18 +03:00
sneed	b71fbec130	repair meteor minior stats	2022-05-23 03:29:01 +03:00
sneed	c8d78706ba	add dex colors to castform forms	2022-05-23 02:53:01 +03:00
sneed	ce468a0903	add macros for handling form base stats	2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone	f2c509eab7	Merge pull request #2151 from Sneed69/dummy_abilities ... Add dummy abilities to make base stats header smaller	2022-05-22 13:27:27 -04:00
sneed	587b056ccb	add dummy abilities to PE	2022-05-22 19:55:09 +03:00
sneed	5b0afffd91	popup and flower gift description fixes	2022-05-22 13:10:51 +03:00
BuffelSaft	16570e8c3f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-22 12:55:55 +12:00
GriffinR	593e2c9be0	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
AgustinGDLV	01665c0213	reverted todo for dynamax candy	2022-05-16 13:52:38 -07:00
AgustinGDLV	0de15db564	clean-up	2022-05-16 13:26:26 -07:00
AgustinGDLV	793e8ef5a4	fixed learning moves	2022-05-16 13:12:41 -07:00
AgustinGDLV	03c21c3b71	implementation of EXP candies	2022-05-15 21:28:23 -07:00
BuffelSaft	bb25746e05	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-13 22:40:43 +12:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	12d956872b	Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge	2022-05-13 03:18:37 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
Eduardo Quezada D'Ottone	a896f9aed7	Merge pull request #2133 from Sneed69/cobaberry ... Coba berry fix	2022-05-12 13:39:50 -04:00
sneed	0c0bea33c7	Update items.h	2022-05-12 18:39:10 +03:00
LOuroboros	5b1c31bbc9	Update tutor_learnsets.h	2022-05-10 12:39:36 -03:00
Eduardo Quezada D'Ottone	b6922a1dab	Merge branch 'pokemon_expansion' into evo_overworld	2022-05-09 16:36:34 -04:00
AgustinGDLV	54163240d8	implemented toggelable cancellation / multi-evo	2022-05-08 20:55:29 -07:00
sneed	eebfed20ad	#elif	2022-05-08 09:58:06 +03:00
sneed	d8256663e3	fix syntax	2022-05-07 22:12:10 +03:00
sneed	5592fa434a	catch < gen7 with engine	2022-05-07 22:01:35 +03:00
sneed	7008c01f25	Update items.h	2022-05-07 21:41:21 +03:00
ghoulslash	0172f84617	Merge pull request #2070 from AsparagusEduardo/PE_evoData ... Updated missing evolution and form change data	2022-05-07 11:37:11 -04:00
Eduardo Quezada D'Ottone	4e7ce0b663	Merge branch 'battle_engine' into BE_configs ... # Conflicts: # include/constants/battle_config.h	2022-05-07 10:25:34 -04:00
BuffelSaft	8693db632b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-07 12:27:20 +12:00
AgustinGDLV	03c48b4f3f	compatibility with evo_battle	2022-05-05 15:46:53 -07:00
AgustinGDLV	7d42f93861	added special overworld evo changes	2022-05-05 11:55:31 -07:00
Eduardo Quezada D'Ottone	49905cee04	Ability Patch	2022-05-03 14:14:04 -04:00
sneed	60d7d8f97e	Initial Commit	2022-05-03 03:38:44 +03:00
ghoulslash	f0d74b60ff	Merge pull request #1932 from BuffelSaft/gen_8_moves_batch2 ... Gen 8 moves batch + Beak Blast	2022-05-01 07:47:11 -04:00
ghoulslash	166b16d22c	Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV ... Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-27 08:48:22 -04:00
ghoulslash	29d8ed9602	Merge pull request #2083 from AsparagusEduardo/BE_moveDesc ... Adjusted description of Glacial Lance and Astral Barrage	2022-04-27 08:46:48 -04:00
ghoulslash	fccd4d14b1	Merge pull request #2085 from AsparagusEduardo/PE_PokemonJump ... Added Pokémon Jump data.	2022-04-27 08:45:35 -04:00
ghoulslash	574be40f26	Merge pull request #2099 from Greenphx9/calyrex_rider_icons ... Calyrex Rider Icons	2022-04-27 08:43:53 -04:00
BuffelSaft	5358cc0a00	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-04-25 13:38:13 +12:00
Greenphx9	b3294c60a2	Calyrex Rider Icons	2022-04-22 16:31:17 +10:00
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer ... Trainer hill clean up	2022-04-20 00:20:44 -04:00
Eduardo Quezada D'Ottone	84d713a50f	Legendary and Mythical flags	2022-04-14 18:44:20 -04:00
TheXaman	2fa812df26	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge	2022-04-13 20:51:35 +02:00
LOuroboros	446bcd3181	Merge branch 'master' of https://github.com/pret/pokeemerald into pePret	2022-04-11 01:23:18 -03:00
LOuroboros	eb1834ce84	Merge branch 'master' of https://github.com/pret/pokeemerald into iePret	2022-04-11 01:22:48 -03:00
LOuroboros	b6e2945072	Merge branch 'master' of https://github.com/pret/pokeemerald into bePret	2022-04-11 01:22:10 -03:00
Eduardo Quezada D'Ottone	5fc72c2bfe	Heights and weights in Pokédex Orders lists	2022-04-09 22:40:36 -04:00
garakmon	3fe423a6f4	use json for region map sections ... - update nlohmann/json and pantor/inja in tools/ - create new inja template	2022-04-04 23:32:03 -04:00
Eduardo Quezada D'Ottone	d604d99d6e	Adjusted description of Glacial Lance and Astral Barrage	2022-04-03 16:54:07 -04:00
Eduardo Quezada D'Ottone	dafb5ca74d	Fixed trapping moves not reflecting the configured turn config	2022-04-03 13:03:53 -04:00
LOuroboros	f82c946ff3	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:26:27 -03:00
LOuroboros	af2f70e000	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:21:40 -03:00
LOuroboros	fa39dc76dc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
GriffinR	328b925a08	Move trainer hill map data to bin files	2022-03-31 14:08:31 -04:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -04:00
ExpoSeed	f50a406b18	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2022-03-22 12:56:23 -05:00
GriffinR	0a0157b62c	Name unknown_16.png	2022-03-14 15:54:47 -04:00
Eduardo Quezada D'Ottone	c00873cbc4	Merge pull request #2073 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2022-03-13 18:15:45 -03:00
cbt6	3cc21a0fc8	Format object event graphics info	2022-03-13 05:19:16 +08:00
SubzeroEclipse	d3589103b3	Fixed some move descriptions	2022-03-09 15:23:08 +01:00
GriffinR	b1d61b9227	Merge pull request #1641 from GriffinRichards/subsprite-arr-count ... Use ARRAY_COUNT for obj event subsprite tables	2022-03-03 23:08:52 -05:00
GriffinR	f78f46a1e2	Use ARRAY_COUNT for obj event subsprite tables	2022-03-03 14:54:05 -05:00
ultima-soul	2d3ba500c9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2022-03-01 15:10:19 -08:00
ultima-soul	84a7f960c8	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2022-02-28 23:37:41 -08:00
ultima-soul	86089ce935	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
GriffinR	5d58cdd297	Fix bunny hoppy typo	2022-02-28 13:34:39 -05:00
Eduardo Quezada D'Ottone	b1227af13b	Reverted to separate form change tables for Forces of Nature. ... It was causing form changes with holding items to break	2022-02-26 12:58:49 -03:00