Alex
|
80b5d81a9a
|
Create BattleStruct sub struct for event states (#8131)
|
2025-11-04 18:34:54 +00:00 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
Hedara
|
8c4d1269a0
|
Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge
Conflicts:
INSTALL.md
include/battle.h
include/save.h
src/wild_encounter.c
|
2025-11-01 14:51:14 +01:00 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
PhallenTree
|
9d06a4fb55
|
Emergency Exit on hazards activation + fix end of turn activation (#8075)
|
2025-10-30 17:01:13 +01:00 |
|
Bassoonian
|
f7cbe4853b
|
Add type enum (#8054)
|
2025-10-27 16:41:22 +00:00 |
|
Alex
|
e8ad3c20f7
|
Fixes compilation error due to #8002 (#8050)
|
2025-10-26 15:48:59 +01:00 |
|
Alex
|
4ed1c3309d
|
Decouple (overworld) statuses from ability function (#8002)
|
2025-10-26 13:57:34 +00:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
65244cbeb4
|
Moved usedHeldItem to Party State struct (#8006)
|
2025-10-24 18:56:16 +02:00 |
|
grintoul
|
95c2a6e2b6
|
Multibattle testing system (#7257)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-10-24 15:00:23 +02:00 |
|
Bassoonian
|
fbd702e3a4
|
Some more documentation and cleanup (#8020)
|
2025-10-23 20:14:38 +02:00 |
|
Nopinou
|
f53861ae05
|
Remove appearedInBattle bitfield & redundant use of sentOut partyState (#8011)
|
2025-10-22 23:25:18 +02:00 |
|
PhallenTree
|
2416bfb53b
|
Fixes Echoed Voice base power increase depending on attacker's use of the move (#7997)
|
2025-10-22 13:39:24 +02:00 |
|
Alex
|
786859b6bb
|
Fix Fling Mental Herb message (#7984)
|
2025-10-19 22:38:27 +02:00 |
|
Alex
|
cb0d503f66
|
Decouple passive hp updates from move damage updates (#7942)
|
2025-10-19 16:40:13 +02:00 |
|
Estellar
|
f4f7c38255
|
Use MainCallback wherever posible (#2184)
|
2025-10-14 09:41:27 +01:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|
AlexOn1ine
|
870b93aad9
|
06/10/25 Master to upcoming merge
|
2025-10-06 19:42:42 +02:00 |
|
Bassoonian
|
168e421033
|
Remove two unused bits from battle structs (#7835)
|
2025-10-02 15:54:46 +02:00 |
|
khbsd
|
e385c7f59f
|
feat: change defines in constants/abilities.h to an enum (#7006)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-29 21:35:09 +02:00 |
|
Bassoonian
|
f856f0cb66
|
Remove unused gBattleStruct fields (#7822)
|
2025-09-29 18:09:30 +02:00 |
|
khbsd
|
a4ecd7338b
|
fix: seen flags for first mon in enemy party (#7791)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-28 09:53:55 +02:00 |
|
Alex
|
b2c5a82003
|
Add func GetChosenMoveFromPosition (#7810)
|
2025-09-27 18:25:57 -04:00 |
|
AlexOn1ine
|
a4470cac2c
|
Master to upcoming merge
|
2025-09-27 22:42:53 +02:00 |
|
Alex
|
3c9f05b367
|
Fixes activation order for a couple abilities (#7732)
|
2025-09-27 18:47:10 +02:00 |
|
Alex
|
a00b16fd90
|
Minor clean up for Lightning Rod / Storm Drain (#7778)
|
2025-09-22 23:47:44 +02:00 |
|
PhallenTree
|
5fad32decc
|
Fixes Helping Hand boosts not stacking with each other (#7775)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-22 20:00:34 +02:00 |
|
bassforte123
|
abc471e9bd
|
Fixed Ball Fetch Ability (#7764)
|
2025-09-21 13:16:53 +02:00 |
|
AlexOn1ine
|
bc84e6656d
|
Master to upcoming merge
|
2025-09-17 20:18:51 +02:00 |
|
Alex
|
83bfb34beb
|
Fixes Mycelium Might and Lagging Tail adjusting prio incorrectly (#7742)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-17 18:33:09 +02:00 |
|
Alex
|
f671b130a6
|
Fixes Beat Up incorrect slots usage (#7741)
|
2025-09-17 11:40:40 +02:00 |
|
Alex
|
32f8464fec
|
Attackcanceller fixes and improvements (#7698)
|
2025-09-16 18:00:30 +02:00 |
|
Alex
|
499e90ac4b
|
Fixes Endure and Eject Pack issues (#7687)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-12 18:09:46 +02:00 |
|
Alex
|
0422340356
|
Refactors Attackstring and PP deduction (#7402)
|
2025-09-03 20:25:27 +02:00 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +02:00 |
|
Alex
|
6df3a48ca2
|
Fixes octolock not ending after user switched out (#7556)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-08-25 15:46:36 +02:00 |
|
Hedara
|
da77dba59f
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-08-21 15:40:38 +02:00 |
|
hedara90
|
95eb3ba1a7
|
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-08-21 14:43:41 +02:00 |
|
Pawkkie
|
5794b26a31
|
Remove funcResult from AiThinkingStruct (#7545)
|
2025-08-13 11:41:14 +02:00 |
|
Alex
|
f4c91b5539
|
Convert statuses3 to volatiles (#7514)
|
2025-08-11 23:19:36 +02:00 |
|
Alex
|
38cfc4bacf
|
Modify move prediction to work in doubles (#7087)
|
2025-08-11 12:26:41 -04:00 |
|
AlexOn1ine
|
bd919e3219
|
11/08/25 Master to upcoming merge
|
2025-08-11 08:31:12 +02:00 |
|
Alex
|
7de3663f38
|
Fixes Life Orb still activating if move was absorbed (#7521)
|
2025-08-10 16:58:36 +02:00 |
|
Alex
|
acc82e7d79
|
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-08-05 19:28:33 +02:00 |
|
Alex
|
3841fee888
|
Clean up noResultString (#7408)
|
2025-08-02 15:17:44 +02:00 |
|
Alex
|
cb4450efaf
|
Fixes Effect Spore and Baneful Bunker/Burning Bulwark (#7412)
|
2025-07-30 19:54:12 +02:00 |
|
Eduardo Quezada
|
cf4bb3e286
|
Moved some fields to BattlerState/PartyState (#7409)
|
2025-07-25 22:16:35 +02:00 |
|
AlexOn1ine
|
90eef35715
|
master merge
|
2025-07-19 17:01:18 +02:00 |
|
Alex
|
d5c1d3322c
|
Fixes Status overwrites and Effect Spore wrong func args (#7340)
|
2025-07-15 17:52:44 +02:00 |
|