5400 Commits

Author	SHA1	Message	Date
DizzyEggg	94a3e80c8e	Remove redundant side macros/funcs (#3299) ... Co-authored-by: gruxor <gruxor@proton.me>	2023-09-13 09:19:18 -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
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
kittenchilly	7a24167b4d	Merge remote-tracking branch 'upstream/upcoming' into overworldsnow	2023-09-08 11:47:35 -05:00
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
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