7991 Commits

Author	SHA1	Message	Date
GriffinR	aba5264260	RGB macro use in slot_machine	2021-12-28 17:46:05 -05:00
GriffinR	4fc345fff5	Rename unused frontier pass tilemap	2021-12-28 14:54:09 -05:00
GriffinR	3acf002a9c	Rename generic jp contest tilemaps	2021-12-28 13:16:40 -05:00
LOuroboros	677da7b5e7	Fixed struct names	2021-12-28 14:48:57 -03:00
LOuroboros	cc1a243145	Update src/battle_script_commands.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-12-28 12:18:44 -03:00
GriffinR	ee5e65d9ed	Rename generic title screen tilemaps	2021-12-28 03:57:44 -05:00
W1serV1ser	e0f7e7a2d9	Updated variable name in MOVEEND_SKY_DROP_CONFUSE	2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone	e405bd8ad3	Merge pull request #2005 from LOuroboros/evoMoves ... Implemented evolution moves	2021-12-26 17:24:37 -03:00
LOuroboros	3f010d9aa8	Tweaked GiveBoxMonInitialMoveset ... Otherwise, Pokémon would be generated with their evo moves learned.	2021-12-26 17:13:36 -03:00
LOuroboros	86ed53997b	Update src/pokemon.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-12-26 12:39:56 -03:00
LOuroboros	96012ba065	Update src/pokemon.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-12-26 12:39:45 -03:00
Eduardo Quezada D'Ottone	4d6f54e8d6	Merge pull request #2007 from ghoulslash/be/roleplay ... Update Role Play	2021-12-25 11:37:57 -03:00
LOuroboros	599ca58059	Update main_menu.c	2021-12-25 07:04:19 -03:00
Eduardo Quezada D'Ottone	7bffe6d1d5	Merge pull request #2004 from ghoulslash/be/sports ... Add sport effects back	2021-12-24 18:59:50 -03:00
LOuroboros	03205c995d	Update battle_script_commands.c	2021-12-24 01:59:40 -03:00
Eduardo Quezada D'Ottone	2ebe427a42	Merge branch 'BattleEngine' into BE_wildNaturalEnemies ... # Conflicts: # src/battle_controller_opponent.c	2021-12-23 21:19:59 -03:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone	934ffd5a7e	Merge pull request #2002 from LOuroboros/gen78footprints ... Added the footprints of all Gen. 7 and 8 species	2021-12-23 20:28:55 -03:00
W1serV1ser	58a5a9cbec	Simplified skyDropTargets storage and made other minor improvements ... A lot of these changes are based on ghoulslash's version of Sky Drop.	2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone	a725592a6b	Merge pull request #1999 from ghoulslash/be/moveeffect ... More battle-will-end checks on stat-changing damaging effects	2021-12-23 20:23:16 -03:00
Eduardo Quezada D'Ottone	67697d2de3	Merge pull request #1582 from ghoulslash/smart_wild_ai ... Smart Wild AI Option	2021-12-23 20:18:18 -03:00
ghoulslash	0a95a31ee9	fix formatting	2021-12-23 08:44:54 -05:00
ghoulslash	b6b5d862f4	update role play mechanics	2021-12-23 08:37:11 -05:00
LOuroboros	d6a78f386f	Implemented evolution moves ... Thanks to UltimaSoul and Sagiri/Zeturic	2021-12-22 18:02:23 -03:00
LOuroboros	d94dae18f7	Removed more commented out addresses ... I like to help.	2021-12-21 22:49:30 -03:00
ghoulslash	7839750d7e	Merge pull request #1926 from AsparagusEduardo/IE_itemDesc ... Update to item descriptions based on configured effect.	2021-12-21 09:39:11 -05:00
ghoulslash	2736223b1b	Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems ... Form changing by holding items	2021-12-21 09:10:23 -05:00
ghoulslash	b4cc5e3cd8	Merge pull request #1952 from AsparagusEduardo/PE_natureEvo ... Added Nature evolution methods	2021-12-20 14:08:47 -05:00
ghoulslash	4b5c5d14fc	Merge pull request #1989 from AsparagusEduardo/BE_debugHoldEffects ... Updated AI debug hold effect name display.	2021-12-20 14:07:29 -05:00
ghoulslash	78b42fabef	Merge pull request #2001 from AsparagusEduardo/BE_debugDoc ... Using TAG_NONE in battle debug	2021-12-20 14:06:59 -05:00
LOuroboros	cb44de13b3	B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT	2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone	4ab4250d5d	Merge branch 'battle_engine' into be/sports	2021-12-19 20:42:15 -03:00
LOuroboros	211c8c684d	Update items.h	2021-12-19 20:30:03 -03:00
Eduardo Quezada D'Ottone	a57043b589	Merge pull request #1983 from sphericalice/last_ball_refactor ... Refactor CanThrowLastUsedBall and related functions	2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone	6d17156f74	Merge pull request #1934 from BuffelSaft/fix-burmy ... Fix Burmy form change	2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone	7e3282fba5	Merge pull request #1972 from LOuroboros/spaces ... Removed weird spaces in 7 dex descriptions	2021-12-19 20:14:05 -03:00
Eduardo Quezada D'Ottone	793de70068	Fixed reference to PlayCry2	2021-12-19 13:09:01 -03:00
Eduardo Quezada D'Ottone	8b49f8f925	Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems	2021-12-19 12:08:52 -03:00
LOuroboros	ffe35fbb06	Updated defeat condition on multi battles	2021-12-19 08:30:43 -03:00
Blackforest92	76b9459e42	fix .8bpp palette + revert hippo icons	2021-12-19 17:38:01 +07:00
LOuroboros	a21d2ca98f	Fixed syntax in footprint_table.h	2021-12-18 18:35:18 -03:00
Eduardo Quezada D'Ottone	4ca9f406f6	Merge pull request #1947 from LOuroboros/lightBall ... Updated Light Ball's effect and improved readability	2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone	3a24bc8298	Merge branch 'battle_engine' into DizzyEggg-patch-1	2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone	1772997082	Merge pull request #1994 from AsparagusEduardo/BE_HPDrain ... Config for HP bars moving faster for higher HP amounts. Credit to Dat.H	2021-12-18 13:50:05 -03:00
Eduardo Quezada D'Ottone	39ef356be1	Merge pull request #1935 from LOuroboros/someGenderDiffs ... Added gender differences for a couple of Gen. 4 Pokémon	2021-12-18 13:46:23 -03:00
Eduardo Quezada D'Ottone	a075cca448	Merge branch 'battle_engine' into fix-burmy	2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone	9adbf3350e	Merge pull request #1965 from TheXaman/pokemon_expansion_debug ... Pokemon expansion debug	2021-12-18 13:08:37 -03:00
Eduardo Quezada D'Ottone	bd75ee9688	Using TAG_NONE in battle debug	2021-12-18 10:55:04 -03:00
ultima-soul	18afd06f6d	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-18 00:28:18 -08:00
ultima-soul	b0b8b9bf46	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 23:51:29 -08:00