18854 Commits

Author SHA1 Message Date
PhallenTree
f24173974c
Fixes Thermal Exchange not curing existing burn (#6545) 2025-04-07 10:48:27 +02:00
AlexOn1ine
b94e3298fc dynamax fix 2025-04-06 15:25:12 +02:00
AlexOn1ine
e8cc3c81f8 conflicts 2025-04-06 14:59:12 +02:00
Eduardo Quezada
a3075325a0
GENDER_COUNT in sPlayer/RivalAvatarGfxIds (#2117) 2025-04-05 20:18:07 -04:00
hedara90
5fe58a1ed0
Thermal exchange tests (#6536)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-05 09:22:58 +02:00
Alex
8dd2fee4a9
Fixes Will-O-Wisp not being blocked by Thermal Exchange (#6534) 2025-04-04 23:01:10 +02:00
Pawkkie
9cb96235f9
Add basic Unaware check bad move scoring (#6524) 2025-04-02 18:18:33 -04:00
Alex
5b9077e207
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499) 2025-04-02 23:52:54 +02:00
Alex
1e38c36912
Fixes transformed mon being able to use tera on Terapagos (#6528) 2025-04-02 23:51:45 +02:00
hedara90
ff8bf967d4
Added AI switch display to the battle debug (#6529)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-02 23:44:09 +02:00
Alex
c1f18d0765
Refactor protect to allow at least 126 different types of protect eff… (#6506) 2025-04-02 17:26:05 +02:00
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons (#6526) 2025-04-02 14:28:53 +02:00
aronson
991065f25a
Support make check on macOS (#6513) 2025-04-01 21:52:49 +02:00
PhallenTree
ea59e858fb
Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects (#6522) 2025-04-01 21:03:04 +02:00
AlexOn1ine
0c35879e02 conflicts 2025-04-01 19:11:55 +02:00
hedara90
4f0caf8199
Fixes Tera Type not being carried over to during form change / evolution (#6502) 2025-04-01 16:52:40 +02:00
Eduardo Quezada
807b9cb152
Update maintainer list (#6521) 2025-04-01 07:31:19 -07:00
AlexOn1ine
abfabb9699 revert fallback 2025-04-01 15:57:04 +02:00
psf
2e6c62ff54
Add CONTRIBUTING.md and STYLEGUIDE.md (#6340)
Co-authored-by: HackMD <37423+hackmd-hub[bot]@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-04-01 15:38:59 +02:00
Alex
02ec421606
Fix using items to heal partner in battle (#6517) 2025-04-01 13:21:12 +02:00
Hedara
881d924cf3 Fix using items to heal partner in battle 2025-04-01 10:38:12 +02:00
DizzyEggg
4618ba7407 Align gMPlayTrack_BGM 2025-04-01 00:31:38 +02:00
hedara90
3366595138
Add AI thinking cycle count display to frame count (#6509) 2025-03-31 20:35:10 +02:00
hedara90
d6a26474d3
31-03-25 master to upcoming merge (#6511) 2025-03-31 20:25:51 +02:00
Isaac Aronson
74e84da571
Remove NDEBUG guard on cycle counter functions 2025-03-31 13:11:18 -05:00
Alex
bc2a5a9860
Add General Merge to label check (#6512) 2025-03-31 19:56:38 +02:00
hedara90
d039950f6c
Update labels.yml 2025-03-31 19:24:56 +02:00
aronson
692f7968fc
Use non-preproc guards on AI frame count
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-31 12:06:12 -05:00
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
AlexOn1ine
d767211c4a helper function to get the species type based on personality 2025-03-31 14:49:40 +02:00
malad1211
190b916db0
Fix move names in learnset helper (#6510) 2025-03-31 13:41:51 +02:00
Isaac Aronson
926a7437da
Add AI thinking cycle count display to frame count 2025-03-30 17:24:36 -05:00
hedara90
899438a1c2
Mark RTC/Flash save hint string as used (#6507) 2025-03-30 22:00:55 +02:00
Isaac Aronson
6f4a5ce1a0
Mark RTC/Flash save hint string as used 2025-03-30 14:14:40 -05:00
hedara90
35eae05203
1.11.1 Release (#6503) 2025-03-30 16:12:14 +02:00
Hedara
3615fdde29 START OF 1.11.2 CYCLE 2025-03-30 14:56:39 +02:00
Hedara
e350bea168 Expansion 1.11.1 Release 2025-03-30 14:55:51 +02:00
Alex
093e265515
Fixes Destiny Bond against Dynamax no failing (#6501) 2025-03-30 14:18:21 +02:00
AlexOn1ine
3b9b24312a Fixes Tera Type not being carried over to during form change / evolution 2025-03-30 13:31:27 +02:00
aronson
68a869da99
Hide in-battle types from Union Room trade request (#6489) 2025-03-30 10:57:58 +02:00
Alex
388389714b
Rename removelishtscreenreflect to removescreens (#6495) 2025-03-30 10:52:24 +02:00
Alex
23841f6322
Fix hit escape ace mon switching (#6498) 2025-03-29 19:34:37 +01:00
Alex
adf4928fe0
Fixes timesGotHit not increasing on forced switch out (#6493) 2025-03-29 19:33:50 +01:00
Alex
4c7ac8066e
Fix Choice'd AI not switching if player immune to move (#6464) 2025-03-29 19:23:00 +01:00
Pawkkie
1c0e5bb0e1 fix hit escape switching 2025-03-29 14:18:20 -04:00
Pawkkie
ddbdc1f716 Fixes across the board 2025-03-29 13:54:44 -04:00
Alex
c1364e14d4
Fixes Hospitality not being blocked by Heal Block (#6494) 2025-03-29 17:07:56 +01:00
Alex
a90e53aa67
Pret merge 2025-03-29 (#6496) 2025-03-29 16:29:15 +01:00
Hedara
a3a48c59b8 Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29 2025-03-29 14:21:29 +01:00