7383 Commits

Author SHA1 Message Date
Eduardo Quezada
800829538c
Compound strings for hold effect names (#7140) 2025-06-18 11:38:42 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) (#7018) 2025-06-18 10:59:24 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring (#6983) 2025-06-18 07:22:41 +02:00
Eduardo Quezada
5966852f8d
Removed Mind Blown effect in favor of move flag (#7138) 2025-06-17 00:02:46 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change (#7139) 2025-06-17 00:02:25 +02:00
Alex
e2f0767be5
Decouple Status set by ability from SetMoveEffect (#7125) 2025-06-16 14:45:21 +01:00
Alex
d4146afcae
Add damage context to effectiveness multiplier (#7111) 2025-06-14 11:05:14 +02:00
Alex
e1b542944f
Refactor damage calculations aruguments by using a struct context (#7108) 2025-06-13 14:16:40 +02:00
Alex
aa78420b9e
Deprecate absent member from battlerState (#7091) 2025-06-12 10:41:46 +02:00
Pawkkie
3db12a0ae6
Haze Boosting AI Followup (#6966) 2025-06-11 18:30:22 +02:00
hedara90
c9a49e696e
Increased heap by 768 bytes (#7097)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-11 17:55:32 +02:00
Bassoonian
192bc1ec20
Master merge (#7093) 2025-06-10 22:52:43 +02:00
Alex
cb4ef705f7
Remove redundancy for ShouldLowerStat functions (#6577) 2025-06-09 21:47:16 -04:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
Alex
fd856e5068
Removes duplicate AI ability func (#7045)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-06-09 11:30:16 +02:00
Emilia Daelman
f4ff5e6d26
Feature/ai/wide guard quick guard singles (#7086)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-08 21:50:34 +02:00
kittenchilly
872bb8785b
Simplify white out messages (#6961) 2025-06-08 08:52:37 -07:00
hedara90
8489b7a622
Added naive line break (#7076)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-06 20:13:07 -07:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Philipp AUER
21f0eb1583
Debug parties and battles (#6884)
Co-authored-by: sbird <sbird@no.tld>
2025-06-03 23:21:17 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities (#7043) 2025-06-03 22:05:22 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
Alex
d33651bfd0
Battle controller pret documentation (#7029) 2025-06-02 14:22:11 +02:00
Eduardo Quezada
8697bef20c
BtlController_EmitTwoReturnValues cleanup (#6855) 2025-06-01 11:29:02 +02:00
hedara90
392d4db319
Fix follower compression (#7038)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-01 10:06:12 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
jfb1337
096493aa35
AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705)
Co-authored-by: jfb1337 <>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-31 09:47:25 +02:00
Alex
eb81820ae3
Clean up battlescript calls with func BattleScriptCall (#6873) 2025-05-31 09:09:35 +02:00
cawtds
21499cbee1
Refactor field moves (#6660) 2025-05-31 09:03:12 +02:00
PhallenTree
fa342b2909
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004) 2025-05-31 08:45:46 +02:00
hedara90
6e64f6f5ef
New sprite compressor (#5627)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
2025-05-30 23:10:54 +02:00
Hedara
0e968b31a9 Start of 1.13 cycle 2025-05-30 21:24:29 +02:00
Hedara
98c03315a9 Start of 1.12.1 cycle 2025-05-30 20:55:09 +02:00
Hedara
efa2fb3be7 Expansion 1.12.0 2025-05-30 20:53:32 +02:00
Hedara
09ee1d0b2d Merge branch 'upcoming' into expansion-1.11.4 2025-05-30 20:45:19 +02:00
Hedara
acb4a9cf62 Expansion 1.11.4 2025-05-30 20:15:56 +02:00
AlexOn1ine
f4c64a2d79 conflicts 2025-05-30 19:20:32 +02:00
psf
9656400f88
Moved time constants to dedicated files (#7019) 2025-05-30 16:39:01 +02:00
cawtds
1e32cf278c
fix battle controller macros (#7021) 2025-05-30 16:31:38 +02:00
Alex
213503dee9
Fixes spread move fire types not defrosting all targets (#6998) 2025-05-29 11:25:10 +02:00
Hedara
c8570d7c2b Remove incorrectly re-added ABILITYEFFECT_ cases 2025-05-28 14:38:57 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
psf
d80e92e687
Pret merge (27th of May, 2025) (#6995) 2025-05-28 03:44:51 -07:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
Hedara
156e0b394c Start of 1.11.4 cycle 2025-05-27 20:34:28 +02:00
Hedara
7d1833f277 1.11.3 release 2025-05-27 20:33:27 +02:00
Hedara
647c786c53 Merge commit '07c897a' into pret-merge
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
2025-05-27 19:46:13 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
2025-05-27 19:22:40 +02:00