744 Commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	b48f057fe7	Merge pull request #1589 from cynderquil/pokemon_expansion ... Fix Bastiodon's second icon frame	2022-11-20 20:47:07 -03:00
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
GriffinR	3e8baa5b04	Merge branch 'master' into porymap-5	2022-10-18 22:54:25 -04:00
GriffinR	a10ec0487e	Color rotating gate pngs	2022-10-12 19:19:42 -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
GriffinR	9bcc36fe08	Merge pull request #1767 from GriffinRichards/trainer-pals ... Generate trainer pic palettes from image	2022-09-22 11:34:03 -04:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada D'Ottone	f79e9f02de	Merge pull request #2289 from Blackforest92/RHH-PR-Branch ... Tidying Graphics/Battle_Anims	2022-09-06 17:02:25 -04:00
GriffinR	c8afeea182	Generate trainer pic palettes from image	2022-09-05 16:09:45 -04:00
Blackforest92	7e9d243677	Tidying graphics/battle_anims	2022-09-04 23:24:37 +07: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
Blackforest92	61c33f56a0	Updated to latest master branch + add PLA's data to teachable_learnsets.h	2022-08-29 21:01:31 +07:00
phxGAMMA	4577f635c9	Update fairy.png	2022-08-27 22:42:05 -04: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	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	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
GriffinR	261b0ff118	Standardize judgement vs judgment spelling	2022-08-20 22:58:46 -04: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
Martin Griffin	5e593a62fb	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
GriffinR	bfdbbad468	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -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
Blackforest92	56f4c319a4	Fix multiple pokemon graphics, tidying pokemon graphic folders	2022-07-22 22:17:29 +07: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
ghoulslash	f2ee9f3ba0	tweak z indicator position relative to healthbox	2022-07-18 09:44:04 -04:00
ghoulslash	18affe8c1a	new z move indicator, credits to blackforest	2022-07-18 09:21:59 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04: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
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
Blackforest92	ff861ff963	Add some of Legends Arceus battle sprites	2022-07-04 12:28:40 +07: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
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	ef496ddb9d	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim	2022-05-19 00:54:16 +03:00
sneed	09bace2b26	fix cherrim sprite	2022-05-19 00:40:54 +03:00
sneed	8c15c5b6d7	fix castform sprite	2022-05-18 20:47:14 +03:00
GriffinR	c2dc4a5dea	Some field door comments	2022-05-18 13:03:02 -04:00
GriffinR	5c8e1e81ea	Color single-palette door anim graphics	2022-05-18 12:41:20 -04:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
ghoulslash	574be40f26	Merge pull request #2099 from Greenphx9/calyrex_rider_icons ... Calyrex Rider Icons	2022-04-27 08:43:53 -04: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
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