9480 Commits

Author	SHA1	Message	Date
DizzyEggg	ffb0e20049	hide show party status summary	2023-08-05 23:27:56 +02:00
DizzyEggg	18db0cb3b7	controller string	2023-08-05 22:41:13 +02:00
DizzyEggg	f9e131b6ac	fix recorded, exp update the same for player partner	2023-08-05 21:34:17 +02:00
DizzyEggg	0b4c1aa275	more work on controllers	2023-08-05 20:42:19 +02:00
DizzyEggg	1793b9e1da	more controller functions	2023-08-05 14:11:25 +02:00
DizzyEggg	a505cd7fb9	simplify the get mon set mon data functions more	2023-08-05 12:53:14 +02:00
DizzyEggg	cbebdf044a	handle se, bgm and fainting cry	2023-08-05 12:13:50 +02:00
DizzyEggg	c4bfe40da6	remove empty controller functions	2023-08-05 11:39:42 +02:00
DizzyEggg	5a8b6c18ef	ball throw and start removing empty controller functions	2023-08-05 11:05:37 +02:00
Eclipse	5226935857	Fixed Trainer class ball not assigned to second Pokémon (#3203)	2023-08-04 22:56:05 -04:00
GriffinR	41847cd5aa	STAT_ANIM constant usage	2023-08-04 16:27:45 -04:00
DizzyEggg	c72bb27325	faint animation	2023-08-04 22:15:39 +02:00
GriffinR	866c32a735	Add temp var aliases	2023-08-04 14:17:28 -04:00
DizzyEggg	7360a4a18a	up to return mon to ball	2023-08-04 17:29:29 +02:00
DizzyEggg	7ba8a0216f	more work on controllers	2023-08-04 13:42:40 +02:00
ghoulslash	a0dd77dd41	Improve AI switching, so it doesn't get killed on switch-in (#3146)	2023-08-04 07:34:58 -04:00
DizzyEggg	cc30d2fb53	start removing duplicate controller functions	2023-08-04 12:10:38 +02:00
ghoulslash	4ae6ae4de3	Reset all battler IDs at battle start (#3111) ... * reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids * replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-08-04 08:57:06 +02:00
GriffinR	6d4dadd7b5	Add temp flag aliases	2023-08-03 15:55:06 -04:00
DizzyEggg	e7bc42fcaf	use IsValidForBattle	2023-08-03 21:17:39 +02:00
LOuroboros	0bace94dc7	Updated Cmd_jumpifsideaffecting	2023-08-03 14:46:45 -03:00
GriffinR	16c0be7ed2	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
Martin Griffin	cd51471c96	Revamped GetTotalAccuracy (#3182)	2023-08-02 12:19:36 +01:00
sbird	1d8ad1b756	[battle, movesets] revert bulbasaur's level up change	2023-08-02 09:51:45 +02:00
Eduardo Quezada	f94efa94e1	Merge branch 'RHH/master' into RHH/upcoming	2023-08-02 01:18:07 -04:00
ghoulslash	7a814999e5	MOVE_CORROSIVE_GAS Effect (#3152) ... # Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/constants/battle_move_effects.h	2023-08-02 01:05:54 -04:00
Eduardo Quezada	87050d8c08	Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143)	2023-08-01 23:54:04 -04:00
Philipp AUER	44eb6260cc	[battle, anim] woodhammer animation overhaul (#3192) ... * [battle, anim] woodhammer animation overhaul * squashme: timings --------- Co-authored-by: sbird <sbird@no.tld>	2023-08-01 19:10:18 -04:00
Eduardo Quezada	f8c0f91c66	Using RGB color constants where appropiate	2023-07-31 15:33:14 -04:00
Eduardo Quezada D'Ottone	54816816a0	Fixed null dereferencing errors with -fanalyzer on modern (#3165)	2023-07-31 14:49:08 -04:00
DizzyEggg	5eec3b2fc3	fix various issues with primal weather blocking water/fire type moves (#3138) ... * fix various issues with primal weather blocking water/fire type moves * forgot to change return to effect=1 * fix bugs	2023-07-30 10:50:51 -04:00
Eduardo Quezada D'Ottone	8196bea2d7	Pret merge 23-07-25 (#3176)	2023-07-30 10:46:23 -04:00
Alex	5167b01b14	var for ability + hold effect, loaded dice comparison ... fix for small bug introduced in the latest commit	2023-07-29 23:36:01 +02:00
LOuroboros	4a657c7eaf	Revamped GetTotalAccuracy	2023-07-29 17:22:10 -03:00
Alex	5fa7a6d4c6	Skill Link Tests, Loaded Dice stuff	2023-07-28 13:20:06 +02:00
DizzyEggg	1baa57418e	Fixed copyright screen not showing up on certain emulators (#2664) ... * Fix old intro not showing up on VBA * Update intro.c * Update intro.c * Update intro.c	2023-07-26 21:33:01 -04:00
Eduardo Quezada	8dafc5e208	Fixed B_ATK_TRAINER_NAME not working properly in tests	2023-07-26 17:36:37 -04:00
Alex	bca29d8586	Adds Mortal Spin and Population Bomb	2023-07-26 17:37:56 +02:00
DizzyEggg	a3d6e31227	Merge branch 'rattled' into stamina_fix	2023-07-26 09:36:46 +02:00
DizzyEggg	c11839c648	Use isValidForBattle	2023-07-26 09:34:23 +02:00
DizzyEggg	7b7cbf506d	Merge branch 'upcoming' into ai_switching	2023-07-26 09:23:53 +02:00
Martin Griffin	0e5c78aeb6	Merge remote-tracking branch 'pret/master' into 'rhh/master'	2023-07-25 19:49:18 +01:00
Eduardo Quezada	ad78dfcf68	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_script_commands.c # src/battle_util.c	2023-07-25 14:38:53 -04:00
Alex	da9b421ae1	Fix Ruin ability calcs (#3171)	2023-07-25 09:59:26 +02:00
Martin Griffin	31a3ada7de	Detect potential misalignment in modern	2023-07-24 19:42:56 +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
ghoulslash	b5431898c2	RNG for Metronome, multi-hit moves, and Loaded Dice (#3159)	2023-07-23 08:15:14 -04:00
Martin Griffin	fc321965a9	RNG_HITS and RNG_LOADED_DICE	2023-07-23 10:24:58 +01:00
ghoulslash	f5d5e544d1	Fix trainer slide messages appearing for frontier trainers (#3162)	2023-07-23 04:37:36 -04:00
gruxor	5a6532ddfb	Merge branch 'upcoming-fixes' of https://github.com/gruxor/pokeemerald-expansion into upcoming-fixes	2023-07-22 14:50:12 -04:00
gruxor	3d25dadcd0	Fixed whitespace indent on switches	2023-07-22 14:49:37 -04:00
gruxor	215d57e871	Update src/fieldmap.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2023-07-22 14:47:07 -04:00
gruxor	4e75f6d454	Minor fix to null check	2023-07-21 16:22:43 -04:00
gruxor	fc8ee625b6	Fixed outstanding UB with -fanalyzer on modern	2023-07-21 15:51:03 -04:00
Alex	ad25dfe1e9	Set otGender + Moves in FillPartnerParty (#3163)	2023-07-21 14:43:39 -04:00
LOuroboros	cd5f997ee3	Added a debug feature to hatch eggs (#3155)	2023-07-21 12:06:05 +02:00
DizzyEggg	e0271a92e9	Fix trainer messages appearing for frontier trainers	2023-07-21 11:40:15 +02:00
Martin Griffin	b406a9c1bd	RandomUniformExcept and RNG_METRONOME	2023-07-20 10:25:03 +01:00
Eduardo Quezada	47cea526ec	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_util.c	2023-07-19 23:22:07 -04:00
Bassoonian	6d7d7f109e	Fix debug menu memory overflow (#3154)	2023-07-19 17:38:09 -04:00
Bassoonian	7fa6ed8b05	Fix priortiy typos	2023-07-19 17:33:28 +02:00
Alex	6b5d1e7577	Adds some gen9 moves (#3147) ... * Adds some gen9 moves * Fix Test + Tabs * Collision Course boost changed to 1.3333	2023-07-19 13:25:20 +02:00
Eduardo Quezada D'Ottone	cf29c9eb69	Fixed enemy parties not reverting to their original form post-battle (#3150)	2023-07-19 08:46:57 +02:00
Eclipse	ca792d43cc	Gender differences sprites, final part (#3122) ... * The last survivors * Tweaked Numel, Milotic and Relicanth Updated their sprites according to their current depictions. --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-07-18 21:31:22 -04:00
DizzyEggg	f4dc5e931f	some more stuff	2023-07-18 12:01:25 +02:00
DizzyEggg	1bd4f9c7a8	rework incoming surviability	2023-07-18 11:36:09 +02:00
Eduardo Quezada D'Ottone	b08c8f85fc	Fixed Utility Umbrella damage calculations (#2835) ... * Fixed Utility Umbrella holders not receiving regular damage when being hurt by what would've been weakened rain/sun attacks * Fixed reading move incorrectly * Tests: Sun, Rain, Utility Umbrella and Hydro Steam * [STASH] Skeli changes, needs to remake tests * Fixed tests * Removed redundant tests * Removed unused variable * Removed Primal Todo tests	2023-07-18 09:22:05 +02:00
Eduardo Quezada D'Ottone	6fec0e4dd1	Ported TheXaman's latest changes to the Debug Menu (#2815) ... * Added option for generating incrementing pokemon in pc boxes # Conflicts: # src/debug.c * added submenu arrows, increased menu high to full screen # Conflicts: # src/debug.c * combined flags and vars into one submenu # Conflicts: # src/debug.c * added new window to flags/vars showing the current state and added submenu indicator # Conflicts: # src/debug.c * added alligned arrows for debug submenus # Conflicts: # src/debug.c * used {CLEAR_TO X} instead of manual spaces # Conflicts: # src/debug.c * renamed gDebugText to proper sDebugText # Conflicts: # src/debug.c * added Fill submenu, added fill function for PC items and all bag pockets @LOuroboros # Conflicts: # src/debug.c * put cheat start into utility # Conflicts: # src/debug.c * put fill submenu into main menu # Conflicts: # src/debug.c * tiny fix * renaming and reordering # Conflicts: # src/debug.c * Added reset pokedex flags for @AsparagusEduardo * made flag toggle list dynamic # Conflicts: # src/debug.c * initial battle debug menu WIP # Conflicts: # src/debug.c # src/wild_encounter.c * fix visual bug * added battle start # Conflicts: # include/debug.h # src/battle_ai_script_commands.c * Added faster way to add initial movesets to mon * Added waiting music for the slow box filling * Simplified the call to scripts * Simplified debug scripts * Disabled Battle Test for now * Fixed personality on fast PC fill being always 0 * Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT * Added missing return TRUE * Sets nickname * Changed how GetSpeciesName to how it's used upstream --------- Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>	2023-07-18 09:17:03 +02:00
Eduardo Quezada D'Ottone	43ad1a4d3b	Unified multi-strike move flags (#3126) ... * Unified twoStrikes and threeStrikes flags into strikeCount * Decreased strikeCount max from 255 to 15.	2023-07-18 09:07:14 +02:00
Alex	38655b9d1f	Fix gem boost on multi hit moves and config for gem param (#3144)	2023-07-18 06:11:54 +01:00
DizzyEggg	04feba8314	test for electromorphosis, small fix for wind power	2023-07-17 16:30:59 +02:00
DizzyEggg	c0f10623d6	Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix	2023-07-17 15:35:40 +02:00
Alex	330e20b9e9	Fix Protosynthesis and Quark Drive boosts (#3139) ... * Fix Protosynthesis and Quark Drive boosts * Added Tests + fix newly introduced bug in the PR Add unintentionally deletet break new line	2023-07-17 11:10:13 +02:00
DizzyEggg	1f1d24b3e4	Fix Primal Reversion not activating when switching in after fainting (#3141) ... * Fixed Primal Reversion not activating when switching in after a fainting * add tests for primal reversion Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-07-16 12:26:54 +01:00
Martin Griffin	17f8f50a59	Merge remote-tracking branch 'rhh/master' into upcoming	2023-07-16 07:46:34 +01:00
Eclipse	fb8989414f	Fixed Mega Venasaur icon (#3137)	2023-07-16 02:40:21 -04:00
DizzyEggg	3c5c68ac58	Fix how AI categorizes Weak moves and give priority to always hits moves when needed (#3109) ... * ai weak move fix and always hits move prioritarizing	2023-07-16 07:24:59 +01:00
Martin Griffin	58ede15263	Fix Roullout Fury Cutter AI power calc (#3110)	2023-07-16 06:45:35 +01:00
Martin Griffin	c4057cb0e0	Fix Metronome's/Mirror Move's called move to take powder moves / multi hit moves into account (#3135)	2023-07-16 06:41:18 +01:00
DizzyEggg	2a249654e7	fix mirror move/metronome powder/multi hit moves & tests	2023-07-15 14:00:55 +02:00
Martin Griffin	e9bd8979b0	More efficient Random calls in Shuffle	2023-07-14 18:57:19 +02:00
Eduardo Quezada	168b005406	Merge branch 'RHH/master' into RHH/upcoming	2023-07-14 12:40:01 -04:00
SonikkuA-DatH	6382640f8a	Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127) ... * Casrform graphics. Palette changes, edited backs, and 2 Frame anims * Castform Graphics * Cherrim graphics, and Castform redefinitions * Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette * Revised Spinda Spot drawing function, removed tabs * Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set * Spacing * Forgot shiny pal. Fixed * Delete .vs directory * remove vs ref	2023-07-14 11:45:40 -04:00
Martin Griffin	96159d189f	Clear fixedPopup when gTestRunnerHeadless (#3133) ... Previously fixedPopup = FALSE was unconditional, but it was erroneously changed in f1b9872bf0.	2023-07-14 11:26:19 -04:00
DizzyEggg	0c0b841a80	Remove debug item effect override (#3106)	2023-07-13 18:47:01 -04:00
Eduardo Quezada D'Ottone	0efc9a29ad	Disabled species now default their graphics to SPECIES_NONE (#3116)	2023-07-12 20:11:07 -04:00
Eduardo Quezada	3aaa89ce71	Changed all instances of gSpeciesNames so that it uses GetSpeciesName	2023-07-07 14:37:51 -04:00
Eduardo Quezada	adfc0af372	Mon graphics are now loaded depending on their availability ... - If it has a female sprite/palette, it's loaded. - If it the species is enabled and it has a sprite/palette, it's loaded. - Otherwise, load the SPECIES_NONE graphics.	2023-07-07 14:36:30 -04:00
sbird	6482279fa3	[battle, math] refactor damage calculation to use proper fp type and inlined multiplication	2023-07-07 18:51:23 +02:00
Eduardo Quezada	404b18564f	Merge branch 'RHH/master' into RHH/upcoming	2023-07-06 15:28:41 -04:00
DizzyEggg	98ae1beaec	Fix ability pop-up properly updating text (#3107)	2023-07-06 15:10:28 -04:00
DizzyEggg	cf9b933a5f	Fix Z-Moves softlocking when the z move effect was not used (#3108)	2023-07-06 15:08:28 -04:00
Eduardo Quezada	4405f79d24	Merge branch 'RHH/master' into RHH/upcoming	2023-07-06 13:15:06 -04:00
Eduardo Quezada	f21953f254	Merge remote-tracking branch 'pret/master' into RHH/master	2023-07-06 13:06:31 -04:00
DizzyEggg	9a09f1e3b9	Fix Roullout Fury Cutter AI power calc	2023-07-06 13:41:16 +02:00
Eduardo Quezada	4bbb3a1e51	Merge branch 'RHH/master' into RHH/upcoming	2023-07-05 19:28:37 -04:00
Eduardo Quezada	b10b5fd9c3	EVERYTHING_CUSTOMIZED -> TRAINER_PARTY	2023-07-05 18:31:08 -04:00
Eduardo Quezada	e8487961c7	TrainerMonCustomized -> TrainerMon	2023-07-05 18:29:28 -04:00
Eduardo Quezada	b86184a4f6	Removed TrainerMonPtr	2023-07-05 18:23:18 -04:00
Eduardo Quezada	2f9e0ecd9f	Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED	2023-07-05 18:22:48 -04:00
ghoulslash	1a53154324	Beat Up AI Damage Calc (#3104) ... * add specific AI dmg calc for new beat up * beat up ai calc optimizations --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-07-05 20:59:42 +02:00
DizzyEggg	34aff01d3a	Fix graphical/exp bugs with 2 vs 1 trainer battles (#3105)	2023-07-05 14:52:24 -04:00
Martin Griffin	eab4e32e2a	Shuffle implementation (#3097)	2023-07-05 19:46:40 +02:00
Eduardo Quezada	0b3c7b7d3b	Converted IV fields to the current system	2023-07-04 21:49:06 -04:00
Eduardo Quezada	3dd7a2c09e	Removed TrainerMonNoItemDefaultMoves	2023-07-04 21:29:58 -04:00
Eduardo Quezada	9c961b4fd5	Removed TrainerMonNoItemCustomMoves	2023-07-04 21:22:27 -04:00
Eduardo Quezada	1ef56f6ae1	Removed TrainerMonItemDefaultMoves	2023-07-04 21:16:47 -04:00
Eduardo Quezada	c201cae2ee	Removed TrainerMonItemCustomMoves	2023-07-04 21:06:55 -04:00
Eduardo Quezada D'Ottone	862602233d	Gender differences sprites, part 3 (#3095)	2023-07-04 11:36:24 -04:00
ghoulslash	cc3a6d4d94	make special case ABILITYEFFECT_xx ids their own caseId switch cases to fix potential overlap with ability IDs 0xFF etc (#3083) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-07-03 10:03:50 +02:00
Eduardo Quezada D'Ottone	1fa9a05470	Convert move flags and bans into GCC bitfields (#2952) ... * Slicing moves to new bitfield * Wind moves to new bitfield * Two-strike moves to new bitfield * Forgot to add flagTwoStrikes to battle_moves.h * Removed "flag" from field names * FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER * Airborne moves * FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE * FLAG_BALLISTIC and FLAG_PROTECTION_MOVE * Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c * FLAG_SOUND * FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER * FLAG_DMG_MINIMIZE * Cleanup * FLAG_STAT_STAGES_IGNORED * Updated Pollen Puff's ballistic flag * FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST * thaw * FLAG_THREE_STRIKES * FLAG_IRON_FIST_BOOST * FLAG_RECKLESS_BOOST * FLAG_HIGH_CRIT * Removed empty flags * Moves that fail when called by Me First + added missing Shell Trap * Moves that fail when Gravity is active * Better names for banned fields * Moves that fail when called by Instruct * Cleanup * Contact Moves + Fixed Wandering Spirit skipping contact checks * Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect. * Simplified B_MOVE_FLAGS configs * FORBIDDEN_METRONOME * Renamed hitsPastSubstitute to ignoresSubstitute * FORBIDDEN_PARENTAL_BOND * Struggle uncallable by Metronome * FORBIDDEN_MIMIC * FLAG_KINGS_ROCK_AFFECTED * Made a single config for move flags * Macro for checking move flags * FLAG_MAGIC_COAT_AFFECTED * Fixed HasMagicCoatAffectedMove * FLAG_SNATCH_AFFECTED * Removed unused EFFECT_FLINCH_MINIMIZE_HIT * Fixed Stench/King's Rock interaction * Removed sMovesNotAffectedByStench in favor of checking move effects * Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT * Changed Gen2 configs to less than Gen 3 * FORBIDDEN_SLEEP_TALK * Cleanup * Inverted FLAG_MIRROR_MOVE_AFFECTED * FLAG_SHEER_FORCE_BOOST * Ordered * FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT * Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field * Fixed Triple Arrows test	2023-07-03 10:01:59 +02:00
gruxor	68ce97cd90	Fixed shadows in viewer (#3094) ... * Fixed shadows in viewer + minor arg signature fix * Unfixed castform functions, upcoming removal	2023-07-02 19:41:47 -04:00
SubzeroEclipse	23d51df7c0	Added Hisuian Sneasel	2023-07-01 11:16:31 +02:00
SubzeroEclipse	d202bdd09c	Added even more gender difference sprites, 2/2	2023-07-01 10:25:17 +02:00
Eduardo Quezada	2c4a9b754d	Merge branch 'RHH/master' into RHH/upcoming	2023-06-30 16:14:57 -04:00
ghoulslash	a0ad8c817c	Change Mega evo sprites from 3per battler to 1 per battler (#3087)	2023-06-30 09:05:07 -04:00
Eduardo Quezada D'Ottone	2100a760ad	A selection of animation frames (redone) (#3090) ... * Applin Family * Placeholder single frames to macro * Stufful/Bewear * Chewtle/Drednaw * Rookidee/Corvisquire/Corviknight * Rolycoly/Carkol/Coalossal * Missing animations * Grubbin/Charjabug/Vikavolt * Turtonator and Wimpod/Golisopod * Jangmo-O/Hakamo-O/Kommo-O * Pyukumuku and Dewpider/Araquanid * Fixed Charjabug/Vikavolt palettes * Pincurchin and Sizzlipede/Centiscorch * Alolan Exeggutor and Salandit/Salazzle * Reverted PLACEHOLDER_ONE_FRAME_ANIMATION for a separate PR * Forgot Pyukumuku's animation	2023-06-30 14:13:42 +02:00
SubzeroEclipse	0733e0908c	Added even more gender difference sprites, 1/2	2023-06-30 10:40:46 +02:00
Eduardo Quezada D'Ottone	81e59ace25	Cleaned up remaining Castform hack stuff (#3063) ... * Removed gCastformFrontSpriteCoords * Removed sCastformElevations and IsCastformForm * Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct * Scrubbed unused BS commands * Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants * Removed redundant function in Pokémon Debug menu * Removed handling in animation scripts * Removed gBattleMonForms * Reduced MAX_MON_PIC_FRAMES to 2 * Removed Castform/Cherrim makefile stuff * Fixed weather form change tests not checking species. * Fixed Castform palettes after Lunos' PR	2023-06-30 09:58:07 +02:00
DizzyEggg	1e2a613bd2	fix debug menu not removing task (#3088)	2023-06-29 14:11:02 -04:00
ghoulslash	e21fcda54c	Fix Light Of Ruin freeze and potentially other move anims (#3084)	2023-06-29 11:58:53 -04:00
Eduardo Quezada D'Ottone	4c4365b0c1	Config for LGPE friendship stat boost (#2257) ... * Config for LGPE friendship stat boost * Separated Exp and Stat settings	2023-06-28 18:44:53 +02:00
Alex	20099274d8	Fix Clear Amulet visual bug + Tests (#3074) ... * Fix Clear Amulet visual bug + Tests TODO Tests, additional tests + Triple Kick pp bug * Wonder Guard message, switch instead of if, misalignments	2023-06-28 12:26:03 -04:00
DizzyEggg	a4a519b69f	Change Mega evo sprites from 3per battler to 1 per battler	2023-06-28 10:38:38 +02:00
Eclipse	fc52414383	Added many more gender differences sprites (#3082) ... Added sprites for the remaining Gen1 mons and a couple of evolutions.	2023-06-27 21:11:01 -04:00
DizzyEggg	09013ee2db	Fix createsprite battle anim cmd not checking MAX_SPRITES	2023-06-27 22:39:43 +02:00
Eclipse	a44af6f06f	Gender differences sprites, part 1 (#3070) ... * Added some gender difference sprites Added sprites for: - Pikachu/Raichu - Doduo/Dodrio - Goldeen/Seaking - Xatu - Politoed - Meditite/Medicham - Gible/Gabite/Garchomp NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird. * Swapped Pikachu sprites Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had. * Added Gloom and Vileplume * Fixed Pikachu forms Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this. * Swapped a few more sprites Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back	2023-06-26 19:04:19 -04:00
PacFire	4b3b9b5e0a	Added icon for Clear Amulet (#3078) ... * Update graphics.h * Update item_icon_table.h * Update items.h * Add files via upload added icon for clear amulet, shards still missing. * Add files via upload added clear amulet's palette * Update graphics.h	2023-06-26 18:19:33 -04:00
Eduardo Quezada	f9bf91a2f0	Merge branch 'RHH/master' into RHH/upcoming	2023-06-26 18:09:53 -04:00
ghoulslash	c7e8edf19b	Easy Chat always shows words in uppercase (#3050)	2023-06-24 13:28:13 -04:00
ghoulslash	5f147925a6	Fixed AI_WhoStrikesFirst considering status priority moves when it shouldn't (#3064)	2023-06-24 13:26:59 -04:00
Eduardo Quezada	ca1d9f5393	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # include/battle_util.h	2023-06-21 15:01:14 -04:00
ghoulslash	7371a9e401	Add many gen 8 move animations (#2861) ... * port many gen8 and 9 move anims from cfru * fix thunder cage, shell smash, shelter anims. update anim credits --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-06-21 13:19:54 -04:00
voloved	c911d4bf57	Made window's starting location track with ball; made window show if it's showing on startup (#3042)	2023-06-21 13:19:08 -04:00
Pawkkie	62ae3b1df1	Fix bug due to variable overflow when AI chooses new Pokemon to send out (#3068)	2023-06-21 12:59:30 -04:00
Alex	43821d606f	Fix Baton Pass for when Ace mon is the last alive (#3067) ... * Updated preproc config for Diamond Storm * Fix baton pass bug with IsAceMon remove not needed check --------- Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2023-06-21 11:11:06 -04:00
Eduardo Quezada	6342da3b58	Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming	2023-06-20 15:41:30 -04:00
Eduardo Quezada D'Ottone	186d8763ea	Fixed selling TMs set as reusable (#3049)	2023-06-19 16:19:29 -04:00
Eduardo Quezada D'Ottone	b01f7927cf	Fixed Sylveon's evolution method (#3048)	2023-06-19 16:17:51 -04:00
Eduardo Quezada D'Ottone	5128520291	Fixes Hisuian mon not evolving + Fixed regional mon not breeding correctly (#3047)	2023-06-19 16:16:55 -04:00
Eduardo Quezada D'Ottone	0d86ab0945	Gen. 9 Move Effects, 2nd batch (#2870)	2023-06-19 14:00:03 -04:00
Joggel19	7be7ecfa51	fixed AI considering status priority moves for AI_WhoStrikesFirst	2023-06-19 18:07:54 +02:00
LOuroboros	2bf88502a7	More corrections	2023-06-19 04:18:53 -03:00
LOuroboros	48c04f936a	Split Refresh's and Take Heart's effects in AI_CheckViability	2023-06-19 00:08:59 -03:00
Eduardo Quezada	1c829c0dcd	Merge branch 'RHH/master' into RHH/upcoming	2023-06-17 17:49:15 -04:00
LOuroboros	9984a9e096	Update src/data/battle_moves.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-06-15 09:59:25 -03:00
LOuroboros	9896f20eb8	Applied fixes and corrections (Jun 2023)	2023-06-15 09:22:26 -03:00
LOuroboros	eb26039f33	Adjusted Triple Arrows' checks	2023-06-13 06:03:37 -03:00
LOuroboros	313f522622	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-06-13 05:44:37 -03:00
LOuroboros	8efbe825db	Updated preproc config for Diamond Storm	2023-06-09 14:32:10 -07:00
Eduardo Quezada	49ffd4a2e9	Easy Chat always shows words in uppercase	2023-06-06 10:55:42 -04:00
Eduardo Quezada	601a96f34a	Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly	2023-06-06 08:01:29 -04:00
GriffinR	9c4a59f865	Fix swapped Dodrio Berry Picking palettes	2023-06-05 19:53:59 -04:00
GriffinR	86459acb69	Fix sTVPokemonAnslerTextGroup typo	2023-06-05 13:13:35 -04:00
Bassoonian	7bf34448e4	Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS	2023-06-05 14:15:07 +02:00
AgustinGDLV	1ea23daefe	fixed bug with zeroing out abilities on switch-in	2023-06-03 11:58:57 -07:00
AgustinGDLV	53fa7e524c	allow for illegal abilities within tests	2023-06-03 11:32:54 -07:00
Eduardo Quezada	43da48f992	CpuFastFill for initializing, thanks SBird	2023-06-02 12:22:05 -04:00
Eduardo Quezada	271bca6a3d	Fixed Staraptor using Staravia's footprint	2023-06-02 11:56:36 -04:00
Eduardo Quezada	5bf040f38d	Missing pret improvement that was causing unmatching	2023-06-02 11:56:12 -04:00
Eduardo Quezada	4c57b84cd9	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602 ... # Conflicts: # graphics/pokemon/mawile/footprint.png # src/battle_gfx_sfx_util.c # src/fldeff_sweetscent.c # src/pokedex.c	2023-06-02 11:45:28 -04:00
GriffinR	23b57050c2	Fix some compressed tilemaps	2023-06-01 15:31:12 -04:00
Martin Griffin	412f6f5352	Separate build directory for tests and TESTING define (#3002) ... * Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define	2023-05-31 09:38:37 -04:00
BuffelSaft	2e08277a4e	Fixes Triple Kick effect and Z move damage calc (#2983)	2023-05-31 22:25:16 +12:00
Alex	5a384f9090	Fixes Triple Kick effect and Z move damage calc ... minor correction to the z-move fix Add comment to EFFECT_TRIPLE_KICK	2023-05-29 15:28:40 +02:00
GriffinR	5100eef017	Merge pull request #1890 from GriffinRichards/pal-macro ... Add some missing palette macro use	2023-05-28 18:28:50 -04:00
ghoulslash	4cef99101b	restore items in wild battles (#3031)	2023-05-28 08:52:58 -04:00
ghoulslash	c38b51c570	Fixed Throat Spray's description (#3027)	2023-05-28 08:52:32 -04:00
Alex	7edd1a45a4	restore items in wild battles	2023-05-28 11:31:22 +02:00
GriffinR	890d00471a	Merge pull request #1886 from GriffinRichards/1bpp ... Index footprint images, convert Spinda spots to .png files	2023-05-27 21:58:45 -04:00
Eduardo Quezada D'Ottone	d0e6ea7612	Optimized battle gender checks (#3020) ... * Optimized battle gender checks * Apply suggestions from code review Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> --------- Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>	2023-05-27 17:23:02 -04:00
Eduardo Quezada D'Ottone	c3527dc01e	Fixed Throat Spray's description	2023-05-26 09:24:23 -04:00
Eduardo Quezada	05895c5308	Fixed Frostbite icon appearing in AI Pary menu for mon without ailment	2023-05-25 19:02:13 -07:00
GriffinR	14f7e49099	Add some missing palette macro use	2023-05-25 15:09:16 -04:00
Eduardo Quezada	de2d86408f	Fixed Mimikyu's Disguise not breaking	2023-05-24 13:20:22 -07:00
Eduardo Quezada D'Ottone	b972199141	Battle Item Refactor Fixes (#3022)	2023-05-23 21:32:57 -04:00
AgustinGDLV	5a8715e608	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-23 16:10:44 -07:00
AgustinGDLV	6a92caa9fb	removed old B_WEATHER_FORMS use, tests now have assumptions for config	2023-05-23 16:10:26 -07:00
AgustinGDLV	bb10b0d1b0	fixed GetBattlerSide, removed debug script	2023-05-23 15:50:51 -07:00
AgustinGDLV	a9a32651ac	fixed player not being able to cancel partner action after item	2023-05-23 15:41:25 -07:00
AgustinGDLV	34382fcece	fixed revive in 1v2 battles	2023-05-23 14:19:24 -07:00
AgustinGDLV	d4c7e5e559	changed B_WEATHER_FORM preproc to affect tables instead of function	2023-05-23 14:03:38 -07:00
ghoulslash	0ac203f2e5	Use AI_PARTY->mons in SetBattlerData (#2986)	2023-05-22 12:05:39 -04:00
Alex	2abf1c56f9	Use AI_PARTY->mons in SetBattlerData ... Use gBattlerPartyIndexes	2023-05-22 13:49:15 +02:00
SonikkuA-DatH	12022fa0f6	Gen 4-6 Pokemon Back anims (#2954)	2023-05-20 18:56:23 -04:00
Alex	109b4c4f6c	Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018) ... remove leftover	2023-05-20 15:58:55 -04:00
LOuroboros	580a09e367	Updated DebugAction_Util_CheckSaveBlock	2023-05-20 15:40:36 -03:00
Alex	a0881b8e8d	Terrains freeze the game after player mon faints (#3016)	2023-05-20 11:10:45 -04:00
psf	9506b205e6	Changed 999999 in MaxMoney to MAX_MONEY constant (#3015)	2023-05-20 08:25:59 -04:00
LOuroboros	29d2d4202e	Evolution updates (#3009) ... * Add Hisuian Sneasel's evolution to gEvolutionTable * Updates -Added EVO_ITEM_NIGHT, (it's like EVO_ITEM_DAY but nighttime specific) -Added EVO_ITEM_HOLD (it's like the day based variations, but day agnostic) -Turned the trade evo items into regular evolution items -Ditched the config for the Razor Claw by request -Updated every entry in gEvolutionTable for species that could only evolve via EVO_TRADE_ITEM to LA's standard * Review corrections (extrapolations) * Post Cherrypick corrections * Corrected the description of EVO_ITEM_NIGHT * Added a config for the new items' field-evolving functionality	2023-05-18 06:39:14 -04:00
ghoulslash	487415e56b	Move direct statStage boosts to use statbuffchange (#3000) ... * fix double counting stat boosts for download, moxie beast boost etc * speed boost use statbuffchange * BattleScript_MoveStatDrain use statbuffchange * statbuffchange for rage --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-05-17 11:22:23 -04:00
AgustinGDLV	7b08713707	changed B_WEATHER_FORM_SUPPRESS config to preproc	2023-05-16 20:34:16 -07:00
AgustinGDLV	b269cc6906	changed gastro acid check to properly use GetBattlerAbility	2023-05-16 16:37:18 -07:00
AgustinGDLV	785b100693	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-16 16:29:38 -07:00
AgustinGDLV	0c182345bf	reworked weather form reversion + added more tests	2023-05-16 16:24:25 -07:00
ghoulslash	eaa44cc8b5	fix syntax	2023-05-15 15:20:44 -04:00
ghoulslash	6458cab70a	use NATIVE_ARGS in various to callnative conversions	2023-05-15 15:07:09 -04:00
ghoulslash	60710f823e	merge w upcoming	2023-05-15 13:13:28 -04:00
Eduardo Quezada D'Ottone	2aca82300c	Merge branch 'upcoming' into mega_evo_issues	2023-05-14 22:33:01 -04:00
Eduardo Quezada D'Ottone	447739d005	Fix shiny animation not respecting Illusion mon target and Imposter revealing opponent ability (#2985)	2023-05-14 22:16:58 -04:00
Eclipse	76379661d0	Fixed mons mot disobeying with Gen8 mechanics disabled (#2990)	2023-05-14 22:09:45 -04:00
Frank DeBlasio	2420134e45	Updated Ability Patch for Gen 9 functionality (#2989)	2023-05-14 19:30:30 -04:00
Alex	f6f0e5fa33	Fix for wrong mon position for scripted wild doubles (#2996)	2023-05-14 19:03:14 -04:00
Eduardo Quezada D'Ottone	15adbc8368	Pret merge Friday (#2998)	2023-05-14 18:38:33 -04:00
Frank DeBlasio	d09072fd0d	Updated Esper Wing's accuracy if B_UPDATED_MOVE_DATA is Gen9 (#3004)	2023-05-14 12:55:08 -04:00
Bassoonian	292d460810	Fix ability select in debug givemon	2023-05-12 14:02:14 +02:00
Bassoonian	c05404e772	Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge	2023-05-12 13:48:52 +02:00
GriffinR	6fdf75bd8c	Support plain pixel conversion, convert spinda spots to .png	2023-05-11 13:41:38 -04:00
Salem	8fc4aa9dcd	Remove duplicate CanBePoisoned condition (#2988)	2023-05-10 18:16:57 -04:00
GriffinR	8c537ccd72	Colorize bag select button	2023-05-10 00:33:43 -04:00
GriffinR	8b37b4292a	Document DrawFootprint	2023-05-09 22:43:25 -04:00
Ultimate Bob	64c2eb39c0	Ignore Illusion if the pokemon is the last slot in the party.	2023-05-09 02:33:12 +10:00
Ultimate Bob	ebc8edd5a6	Fix shiny animation not respecting illusion mon.	2023-05-09 00:58:38 +10:00
Salem	fe5e59c910	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-07 17:27:58 +02:00
Martin Griffin	9cd13cc520	Fix USE_ITEM explicit targets	2023-05-07 07:50:41 +01:00
Eduardo Quezada D'Ottone	3cee3b18c8	Fix healthbox reappearing from B_ANIM_SWITCH_OUT_OPPONENT_MON (#2849)	2023-05-06 21:25:04 -04:00
Eduardo Quezada D'Ottone	c530eb2445	Add mirror herb (#2873)	2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone	84aed50c5b	Manually port daycare expansion to modern standards (#2963)	2023-05-06 21:03:05 -04:00
Eduardo Quezada D'Ottone	42445512ad	Battle Item Tests + critical fixes + new test macro (#2940)	2023-05-06 20:43:32 -04:00
CallmeEchoo	488cc410a0	update ability descriptions	2023-05-05 10:24:12 +02:00
GriffinR	dd65eddbdd	Merge pull request #1883 from GriffinRichards/doc-mod ... Add some missing ARRAY_COUNT, make TV_SHOWS_COUNT depend on NUM_NORMAL_TVSHOW_SLOTS	2023-05-05 02:38:30 -04:00
GriffinR	f91abdf765	Merge pull request #1882 from GriffinRichards/ambient ... Add time ranges to UpdateAmbientCry	2023-05-05 02:16:57 -04:00
AgustinGDLV	a5f28afe42	fixed Forecast and Flower Gift	2023-05-04 17:04:54 -07:00
CallmeEchoo	eb5b81684c	refactored snow into damaging weather ... this is necessary for ice body to properly work. doesnt actually do any damage	2023-05-05 01:38:12 +02:00
CallmeEchoo	74f074f5f3	ai scoring for snow and hail relation ... we generally dont want to ecourage to use snow when hail is up and vice versa to avoid looping between the two weathers if score adds up. so we return false in the ShouldSetX functions if either weather is up We also reduce score by a little as further disincentive to loop and since both effect are so similar that switching between them is usually not a good idea	2023-05-03 16:26:41 +02:00
Bassoonian	1068ec5d9f	Fix Plus/Minus to only work with special moves	2023-05-03 13:03:40 +02:00
Salem	a877266400	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-02 21:19:01 +02:00
CallmeEchoo	c5a73f59a4	ad suggested changes	2023-05-02 21:17:14 +02:00
Alex	dd43d62a12	Fixes Triple Dive effect (#2947)	2023-05-02 15:06:21 -04:00
CallmeEchoo	095422c0c0	small ai logic fix	2023-05-02 19:48:03 +02:00
CallmeEchoo	c6fbde6d5c	remove stupidity ... for some reason I added the 50% def increase in snow check twice? this removes that	2023-05-02 16:25:26 +02:00
CallmeEchoo	76721b16f8	add snow weather	2023-05-02 16:25:26 +02:00
CallmeEchoo	15ce9eb71c	fix dire hit message mismatch	2023-05-01 18:53:06 +02:00
ghoulslash	445e9c4b8b	merge w upcoming	2023-05-01 12:05:07 -04:00
ghoulslash	8cce130643	Add Frostbite status (#2942)	2023-05-01 09:45:47 -04:00
Bassoonian	dd96ac0c4f	Add Comatose check to AI "can be Xed" status checks	2023-05-01 15:35:05 +02:00
Bassoonian	39b50d09dd	Add missing CanGetFrostbite	2023-05-01 11:19:10 +02:00
Ultimate_Bob	32e63d8cc7	Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-30 21:15:03 -04:00
Bassoonian	f1d60a4a04	Fixed wrong generation in check	2023-04-30 22:52:37 +02:00
ghoulslash	62ca66bc6b	Refactoring Battle Form changes into the form change tables (#2411)	2023-04-30 08:41:54 -04: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
ghoulslash	b30dad3e7a	Fix anger shell activating when fainted (#2945) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-04-29 21:56:23 -04:00
Bassoonian	c7d39e561d	Clarify weather function	2023-04-29 20:41:54 +02:00
Bassoonian	c82c2c185e	Integrate ghoul's review ... Co-Authored-By: ghoulslash <41651341+ghoulslash@users.noreply.github.com>	2023-04-29 18:29:50 +02:00
Bassoonian	b53c913558	Manually port daycare expansion to modern standards	2023-04-29 18:16:36 +02:00
Bassoonian	854e9be325	Fix move defrosting for both Freeze and Frostbite	2023-04-28 11:26:31 +02:00
Bassoonian	c279830892	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution	2023-04-27 10:50:32 +02:00
GriffinR	36e6981ac0	Replace some & usage with %	2023-04-26 16:12:00 -04:00