5700 commits

Author	SHA1	Message	Date
Alex	a073e7bd59	Adds Gigaton Hammer and Salt Cure (#3297)	2023-09-15 11:18:47 -03:00
kittenchilly	4a3ee0db7f	Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes (#3301) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-14 15:37:57 -03:00
Eduardo Quezada	f3217c18dc	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_util.c	2023-09-14 09:12:12 -03:00
DizzyEggg	7936910f90	Bug Bite - Tests and small fix (#3282) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-14 08:57:30 -03:00
Alex	db039ee4e2	Tera Shards Icons (#3307)	2023-09-14 07:38:45 -03:00
DizzyEggg	25459073e5	ai lag fixes ready	2023-09-14 11:44:44 +02:00
DizzyEggg	bb9501449c	final ai optimizations	2023-09-14 11:05:00 +02:00
DizzyEggg	5ea66f3c0c	more optimizations	2023-09-14 00:07:41 +02:00
DizzyEggg	38dcb3c66c	ai weather optimization	2023-09-13 17:28:26 +02:00
DizzyEggg	b7d0d37757	fix conflicts	2023-09-13 15:14:09 +02:00
DizzyEggg	94a3e80c8e	Remove redundant side macros/funcs (#3299) ... Co-authored-by: gruxor <gruxor@proton.me>	2023-09-13 09:19:18 -03:00
DizzyEggg	9031f5a063	get battlers' speed only once	2023-09-13 14:04:25 +02:00
DizzyEggg	1a64938c9b	optimize dmg move result and ai who is faster	2023-09-13 13:23:19 +02:00
DizzyEggg	406209f738	score to s32	2023-09-13 09:27:49 +02:00
GriffinR	de3493ff0e	Merge pull request #1921 from citrusbolt/blockboxrs ... [LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`	2023-09-12 18:48:05 -04:00
DizzyEggg	9778587935	optimize battle util and item functions by setting u32 variables	2023-09-13 00:02:26 +02:00
DizzyEggg	44bd830d2a	optimize dmg calc and ai dmg calc to reduce lag	2023-09-12 23:20:09 +02:00
Eduardo Quezada	b89722500f	Fixed Mr. Mime capitalization	2023-09-12 13:09:56 -03:00
DizzyEggg	bd48cca8a2	ai delay timer	2023-09-12 10:35:05 +02:00
ghoulslash	b861f6dd9a	Fix overworld snow weather + make overworld fog cause misty terrain (#3241)	2023-09-11 09:28:44 -04:00
ghoulslash	582cfb0ae7	Convert various to callnatives - Part 1 (#3269)	2023-09-11 09:19:56 -04:00
Aaghat	daeb2efd46	some minor clean up	2023-09-11 17:55:17 +05:30
Eduardo Quezada	6a70b06240	Removed unused itemId field	2023-09-10 19:42:33 -03:00
Eduardo Quezada	755e260da4	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # include/constants/battle_move_effects.h # test/battle/move_effect/multi_hit.c	2023-09-10 18:38:46 -03:00
Alex	18577ce598	Fix Scale Shot bug and use Canceller Multihit Moves (#3290)	2023-09-10 11:57:19 -03:00
Aaghat	2d2a255e6f	Forgot to change caught mon dex page	2023-09-09 11:29:24 +05:30
Aaghat	1b17e3adff	set hgss pokedex off by default	2023-09-09 10:59:44 +05:30
Aaghat	332cc29273	Add new Evo methods	2023-09-09 10:56:45 +05:30
Aaghat	6ac16c8c2e	More clean up	2023-09-09 10:16:14 +05:30
kittenchilly	7a24167b4d	Merge remote-tracking branch 'upstream/upcoming' into overworldsnow	2023-09-08 11:47:35 -05:00
Aaghat	dbeaa2b2e9	add config comment	2023-09-08 21:56:12 +05:30
Aaghat	7832a43544	Minor fixes	2023-09-08 21:47:43 +05:30
Aaghat	cc273ed2c4	Clean Up	2023-09-08 19:25:01 +05:30
Aaghat	c4231ba860	Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss	2023-09-08 18:47:26 +05:30
psf	75d06bb599	Generation 6 Experience Share (#3276)	2023-09-07 23:18:18 -03:00
kittenchilly	e20383b0a4	Merge branch 'upcoming' into overworldsnow	2023-09-07 14:29:30 -05:00
Eduardo Quezada	3333395ff7	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1 ... # Conflicts: # include/constants/battle_script_commands.h # src/battle_script_commands.c	2023-09-07 15:54:55 -03:00
Eduardo Quezada	820113d883	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle_scripts.h # include/battle_util.h # src/battle_script_commands.c # src/battle_util.c	2023-09-07 15:13:06 -03:00
citrusbolt	d31b168522	Add blockBoxRS field to struct BoxPokemon	2023-09-05 06:17:10 -06:00
DizzyEggg	cfd802423b	Fling fixes and tests (#3191) ... * begin fling tests * fling fixes and tests * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * scripts names change * fix fling's test file --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-05 06:56:36 -03:00
ghoulslash	675aa5db41	fix GetBattleAnimMoveTargets logic (#3278) ... * fix GetBattleAnimMoveTargets logic * more efficient GetBattleAnimMoveTargets --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-09-05 09:21:14 +02:00
kittenchilly	1e10bbe007	Merge branch 'upcoming' into overworldsnow	2023-09-04 17:57:20 -05:00
kittenchilly	2fa4206bf1	Add new Substitute doll sprites (#3263)	2023-09-04 19:48:43 -03:00
DizzyEggg	d9677763e5	remove gActiveBattler replacement	2023-09-04 10:26:37 +02:00
DizzyEggg	7c2ad314d4	merge with upcoming	2023-09-04 09:40:48 +02:00
kittenchilly	0a781217ea	Merge branch 'upcoming' into overworldsnow	2023-09-02 15:17:23 -05:00
Eduardo Quezada	66710ac22a	Updated various defines	2023-08-31 23:54:11 -04:00
Eduardo Quezada	c4553c71aa	5 more callnatives ... - jumpifshelltrap - jumpifemergencyexited - jumpifrodaffected - jumpifabsorbaffected - jumpifmotoraffected	2023-08-31 23:43:48 -04:00
Eduardo Quezada	4ac61ad15f	handleultraburst, handleprimalreversion, handlemegaevo	2023-08-31 22:34:57 -04:00
Eduardo Quezada D'Ottone	c4e88760f5	Pret merge (2023/08/31) (#3268)	2023-08-31 14:52:18 -04:00
Eduardo Quezada	0d5b00aaf2	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 ... # Conflicts: # README.md # data/battle_ai_scripts.s # data/battle_scripts_1.s # data/maps/BattleFrontier_Lounge7/scripts.inc # include/battle_anim.h # include/battle_message.h # include/constants/items.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_anim_throw.c # src/battle_anim_utility_funcs.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_wally.c # src/battle_gfx_sfx_util.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/party_menu.h # src/data/pokemon/tmhm_learnsets.h # src/daycare.c # src/field_specials.c # src/hall_of_fame.c # src/party_menu.c # src/pokemon.c # src/tv.c	2023-08-31 14:28:01 -04:00
kittenchilly	9fcb1a8687	Merge remote-tracking branch 'upstream/upcoming' into overworldsnow	2023-08-31 11:56:12 -05:00
LOuroboros	d78d63e537	Fixed redundant calls in Teleport's battle script (#3212) ... The battle script was originally making an extra call to attackcanceler and attackstring pointlessly whenever there was a jump to BattleScript_EffectBatonPass. This commit addresses that by relocating BattleScript_EffectTeleport's own calls to attackcanceler and attackstring.	2023-08-31 09:07:06 +02:00
DizzyEggg	aae4a0970c	merge with upcoming	2023-08-30 15:46:27 +02:00
DizzyEggg	493c330cbd	merge with upcoming	2023-08-30 13:23:55 +02:00
DizzyEggg	c29f8259f6	remove gActiveBattler entirely	2023-08-30 12:46:22 +02:00
DizzyEggg	a7615f9649	remove almost all usage of active battler	2023-08-30 11:21:10 +02:00
DizzyEggg	4683783a92	remove active battler from other files	2023-08-30 10:18:31 +02:00
kittenchilly	c8aac3407e	Merge branch 'upcoming' into overworldsnow	2023-08-29 21:02:33 -05:00
kittenchilly	d540eccbb1	Merge branch 'upcoming' into ultraburst	2023-08-29 16:17:35 -05:00
DizzyEggg	0381ccdf32	remove more of gActiveBattler	2023-08-29 16:20:16 +02:00
DizzyEggg	156aa59f18	start removing gActiveBattler in controller emitters	2023-08-29 15:21:31 +02:00
DizzyEggg	44acd287f1	solve conflicts	2023-08-29 10:41:05 +02:00
DizzyEggg	6ae1ba10da	fix conflicts	2023-08-28 13:55:45 +02:00
GriffinR	d67914e114	Merge pull request #1912 from GriffinRichards/moves-mask ... Handful of fixes related to MAX_MON_MOVES	2023-08-27 19:40:59 -04:00
kittenchilly	37f6685949	Merge branch 'upcoming' into overworldsnow	2023-08-27 14:51:57 -05:00
WhenGryphonsFly	5abeb6718d	Correct KEY_INTR_ENABLE	2023-08-27 14:30:57 -05:00
kittenchilly	48d6fe2e64	Merge branch 'upcoming' into ultraburst	2023-08-26 14:43:31 -05:00
voloved	2a2cd77cf4	Allow Cycling Through Balls in the Last Ball Used Menu (#3039)	2023-08-24 19:23:26 -04:00
LOuroboros	9d6953cc63	Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243) ... * Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16. * Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it * Renamed IsMoveHm to IsMoveHM	2023-08-21 12:49:17 +01:00
DizzyEggg	9cf5376c96	use GetBattlerParty in LoadMonSprite	2023-08-21 09:43:01 +02:00
kittenchilly	a79898f1b1	Make fog cause misty terrain	2023-08-20 13:51:48 -05:00
GriffinR	4941e2602a	Merge pull request #1909 from GriffinRichards/stat-anim ... Document stat change animation	2023-08-20 14:29:11 -04:00
kittenchilly	0ad3919f22	Fix overworld snow weather	2023-08-19 01:40:31 -05:00
Eduardo Quezada	d3333812dd	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer	2023-08-17 17:52:28 -04:00
GriffinR	bdc0ea1037	Add MOD to match mod with powers of 2	2023-08-16 16:44:45 -04:00
GriffinR	057928438a	Document ChooseMoveAndTargetInBattlePalace	2023-08-16 16:41:29 -04:00
GriffinR	aca7998b93	Add missing use of ALL_MOVES_MASK	2023-08-16 14:33:15 -04:00
GriffinR	10a10e914b	Merge pull request #1910 from GriffinRichards/misc-constants ... Use miscellaneous missing constants	2023-08-15 17:53:41 -04:00
GriffinR	4c2b12541b	Merge pull request #1908 from GriffinRichards/name-buffer ... Automatically update nickname buffer sizes	2023-08-12 23:36:19 -04:00
kittenchilly	3435c590c9	Merge branch 'upcoming' into ultraburst	2023-08-12 18:58:38 -05:00
Eduardo Quezada	09fc48461f	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # test/battle/move_flags/three_strikes.c # test/move_flag_strike_count.c # test/move_flag_three_strikes.c # test/powder_moves.c # test/status1.c	2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone	d62c0d6d51	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
kittenchilly	5e8caa8d45	Merge branch 'upcoming' into ultraburst	2023-08-12 12:36:11 -05:00
kittenchilly	2b27b0bf00	Constants	2023-08-12 12:30:36 -05:00
Eduardo Quezada	952bacd858	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml # .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml # .github/ISSUE_TEMPLATE/04_other_errors.yaml	2023-08-11 17:50:28 -04:00
Philipp AUER	59da940283	Refactor damage formula to match Gen5+ (#3196) ... * [battle, damage] refactor damage formula to match gen5+ * [test] use exact values for dry skin, swarm tests * fixup: assume stats for dry-skin, swarm tests --------- Co-authored-by: sbird <sbird@no.tld>	2023-08-11 16:28:38 -04:00
GriffinR	b248791f47	Merge pull request #1904 from GriffinRichards/temp-alias ... Add temp flag and var aliases	2023-08-11 15:45:00 -04:00
Eduardo Quezada	f026b51b48	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer ... # Conflicts: # src/battle_main.c # src/battle_tower.c # src/match_call.c	2023-08-11 11:41:44 -04:00
Kermalis	9226b23fb8	Remove ewram in headers	2023-08-10 20:11:07 -04:00
GriffinR	60a6c9d160	Merge pull request #1903 from GriffinRichards/frontier-gfx ... Fix some frontier gfx, adjacent cleanup	2023-08-10 14:49:44 -04:00
GriffinR	18319e8da3	Misc missing constant use	2023-08-10 01:42:18 -04:00
GriffinR	079f2da0f6	Fix some missing constant use in Apprentice	2023-08-10 00:38:23 -04:00
kittenchilly	c3e31af5f3	Ultra burst trigger	2023-08-09 22:12:26 -05:00
GriffinR	d1c2a30149	Merge pull request #1907 from GriffinRichards/fix-tv ... Fix Bravo Trainer Tower member names	2023-08-09 15:25:45 -04:00
GriffinR	6eaaa50ad5	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
Martin Griffin	912a80e27a	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
DizzyEggg	fec8f14fff	IsAiAiBattle function	2023-08-09 15:57:22 +02:00
DizzyEggg	8d5ba6c6d1	allow ai vs ai battles	2023-08-09 09:15:42 +02:00
GriffinR	6598cb30bc	Document stat change animation	2023-08-08 23:56:16 -04:00
GriffinR	65fee186f8	Automatically update nickname buffer sizes	2023-08-08 16:28:09 -04:00
GriffinR	087a2cecef	Fix Bravo Trainer Tower member names	2023-08-08 14:38:00 -04:00
DizzyEggg	f72ec368fc	improve switching with ai bad moves	2023-08-08 12:55:47 +02:00
DizzyEggg	1fb42e4497	Sticky web / Court Change / Mirror Armor tests + small fixes (#3160) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>	2023-08-07 10:27:57 -04:00
Alex	8ee3a3c5bb	solve conflics	2023-08-07 14:25:30 +02:00
DizzyEggg	ce18df46e6	replace global usage of gActiveBattler in controller files	2023-08-07 12:51:58 +02:00
DizzyEggg	b8ba6139cb	health bar update	2023-08-07 10:29:02 +02:00
DizzyEggg	546b0c7e97	handle move anim	2023-08-07 09:26:03 +02:00
DizzyEggg	e8d6c99e6d	more controllers work	2023-08-07 01:05:09 +02:00
DizzyEggg	ef8024d8c5	draw trainer pic	2023-08-06 21:50:59 +02:00
DizzyEggg	a9483c361b	trainer intro ball throw	2023-08-06 12:41:36 +02:00
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	5a8b6c18ef	ball throw and start removing empty controller functions	2023-08-05 11:05:37 +02: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
GriffinR	6d4dadd7b5	Add temp flag aliases	2023-08-03 15:55:06 -04:00
GriffinR	16c0be7ed2	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
Philipp AUER	7d8bcce9a5	Optimize sprite.c (#3175)	2023-08-03 15:57:04 +03:00
Martin Griffin	b3295d1cfb	Reverted BattleMove power to u8 (#3187)	2023-08-02 12:20:11 +01: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 D'Ottone	54816816a0	Fixed null dereferencing errors with -fanalyzer on modern (#3165)	2023-07-31 14:49:08 -04:00
Eduardo Quezada D'Ottone	f0d03dd99b	Set GEN_LATEST to GEN_9 (#3186)	2023-07-31 15:41:53 +02:00
DizzyEggg	efb98e97c7	remove unused config B_CHECK_IF_CHARGED_UP	2023-07-31 14:22:48 +02: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
Alex	bca29d8586	Adds Mortal Spin and Population Bomb	2023-07-26 17:37:56 +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
Martin Griffin	31a3ada7de	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
Martin Griffin	3f5daa8cf1	Add BENCHMARK to test runner ... Counts the time spent in the block in arbitrary time units (64-cycles currently). If the block takes more than ~4 million cycles (~0.25s) the benchmark will wrap around. Note that the time can be affected by the timeout IRQs, and should only be taken as a loose indication of relative performance.	2023-07-24 15:18:28 +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	a527d6c7de	Fix wrong color in stat move animation (#3161)	2023-07-23 04:38:25 -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
DizzyEggg	fc37345c29	Fix wrong color in stat move animation	2023-07-21 10:42:39 +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	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	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
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
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
Eduardo Quezada	240f41fc58	Reverted BattleMove power to u8 ... Nothing was using it, despite what the comment suggested	2023-07-14 10:53:40 -04:00
Eduardo Quezada D'Ottone	5f29ae6f99	Failed tests are now listed in the total (#3073) ... * Failed tests are now listed in the total	2023-07-14 10:17:54 +01:00
Martin Griffin	d3d582dd70	[battle, fpmath] revert changes to Q_24_8 format (#3125)	2023-07-14 10:15:55 +01:00
DizzyEggg	0c0b841a80	Remove debug item effect override (#3106)	2023-07-13 18:47:01 -04:00
sbird	cb66e8b770	[battle, fpmath] revert changes to Q_24_8 format	2023-07-13 23:43:02 +02:00
Eduardo Quezada D'Ottone	0efc9a29ad	Disabled species now default their graphics to SPECIES_NONE (#3116)	2023-07-12 20:11:07 -04:00
gruxor	5fd881a1b6	Remove unused macro to fix syntax highlights	2023-07-12 14:44:23 -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	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	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
Martin Griffin	eab4e32e2a	Shuffle implementation (#3097)	2023-07-05 19:46:40 +02: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
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
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
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
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
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
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
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
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	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
LOuroboros	2bf88502a7	More corrections	2023-06-19 04:18:53 -03:00
LOuroboros	9896f20eb8	Applied fixes and corrections (Jun 2023)	2023-06-15 09:22:26 -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
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
Bassoonian	7bf34448e4	Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS	2023-06-05 14:15:07 +02:00
AgustinGDLV	d795256142	remove debug	2023-06-03 11:56:01 -07:00
AgustinGDLV	53fa7e524c	allow for illegal abilities within tests	2023-06-03 11:32:54 -07: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
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
GriffinR	5100eef017	Merge pull request #1890 from GriffinRichards/pal-macro ... Add some missing palette macro use	2023-05-28 18:28:50 -04:00
AgustinGDLV	3d4789c492	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-28 11:10:50 -07:00
ghoulslash	a929ae8b48	Replace launchtemplate and launchtask in battle anims (#2640) ... * replace launchtemplate with createsprite using fix_launchtemplate.py * tidy up script * fix comment handing in fix_launchtemplate.py * fix double comma after sprite template * remove py script * convert launchtask -> createvisualtask * fix launchtask->createvisualtask issue * fix ANIM_PAL ORs * remove launchtemplate, launchtask macros * fix pal macros in z moves * fix bloom doom * add F_PAL_ALL_BUT_DEF * remove all ANIM_PAL_ usages * devestating drake fix * convert launchsoundtask and setblends * Reworked CFRU macro PR --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-05-27 17:32:53 -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
GriffinR	14f7e49099	Add some missing palette macro use	2023-05-25 15:09:16 -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	d4c7e5e559	changed B_WEATHER_FORM preproc to affect tables instead of function	2023-05-23 14:03:38 -07:00
Eduardo Quezada D'Ottone	f979013b7e	Disable Gen8+ Obedience Mechanics by default (#2980)	2023-05-21 16:57:43 -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
AgustinGDLV	d133564e21	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-16 21:57:06 -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
LOuroboros	49a9210e9d	Fixed typo in include/config/battle.h	2023-05-15 16:45:30 -03: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
AgustinGDLV	e47eca1c5a	mid converting script commands to callnative	2023-05-13 22:07:04 -07:00
Bassoonian	c05404e772	Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge	2023-05-12 13:48:52 +02:00
AgustinGDLV	3b6389ec21	updated tests	2023-05-11 22:13:43 -07:00
AgustinGDLV	aec51b5b04	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-11 20:02:06 -07:00
GriffinR	8b37b4292a	Document DrawFootprint	2023-05-09 22:43:25 -04: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	220b60f315	Detect memory leaks in tests (#2698)	2023-05-06 21:22:47 -04:00