Commit Graph

12887 Commits

Author SHA1 Message Date
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Alex
fedbce510b
Fixes commander activation on a fainted mon (#6632)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:18 +02:00
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation (#6656) 2025-04-20 22:36:27 +02:00
khbsd
6b8e680139
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
2025-04-20 22:27:36 +02:00
PhallenTree
bd64ab599b
Fixes Ally Switch cancelling partner's moves targeting that side of the field (#6647) 2025-04-19 20:24:00 +02:00
Bivurnum
d342b373f0
Fix no eligible mons when only the partner wins in multi battle (#6626) 2025-04-19 14:15:13 +02:00
Alex
6b09480912
Fixes some restore issues (#6629) 2025-04-18 16:57:04 -04:00
Alex
37f72bb237
Fix Mirror Armor and Obstruct interaction (#6630)a 2025-04-18 16:21:57 -04:00
Alex
2a03f881d4
Fixes Big Root Leech Seed heal amount (#6638) 2025-04-18 16:07:18 -04:00
AlexOn1ine
4e2c60ece7 remove wrong check 2025-04-17 19:56:08 +02:00
AlexOn1ine
2d1b2f28c4 Fixes Gulp Missile freezing the game if when attacker fainted 2025-04-17 19:46:16 +02:00
grintoul1
ec2aef2eff
Battle Transition: mugshots for multibattles (#6567)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-17 16:18:20 +02:00
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
hedara90
7a35f35352
Make generated files match the current formatting (#6636) 2025-04-17 13:38:30 +02:00
Bassoonian
1c3d346d4f
Make form change methods into enum + type checking (#6631) 2025-04-16 23:45:41 +02:00
Bassoonian
cca969b04d
Adds move effect type checking (#6618) 2025-04-16 00:08:57 +02:00
hedara90
747bf4b7f6
Capped Exp from Daycare to level cap (#6622)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-15 23:53:46 +02:00
Bassoonian
512368fd03
Add type checking for hold item effects (#6619) 2025-04-15 23:33:00 +02:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests (#6596) 2025-04-14 18:17:24 +02:00
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor (#6224) 2025-04-14 10:57:34 -04:00
AlexOn1ine
99bd3dba4a revert BS_UpdateDynamax 2025-04-14 16:20:07 +02:00
GriffinR
f11bddf854
Fixes for Mirage Tower graphics (#2120)
Some checks failed
CI / build (push) Has been cancelled
* Add documentation for CreateCeilingCrumbleSprites

* Combine mirage tower graphics

* Add comment about mirage tower / player palette
2025-04-14 08:12:45 +02:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
Some checks are pending
CI / build (push) Waiting to run
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Alex
a4bfbea3cb
Revert wrongly done Embody Aspect fix (#6607) 2025-04-14 00:17:10 +02:00
hedara90
3236ea62aa
Fixed DNS off config sometimes breaking palettes on map change (#6603)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 21:04:21 +02:00
Alex
f3c76e866b
Fix potential compile error caused by sTeraIndicatorDataPtrs (#6599) 2025-04-13 19:06:44 +02:00
hedara90
21e8e0d44f
Fix declaration after label for Psywave switch (#6595)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 17:04:03 +02:00
AlexOn1ine
a55bbb6352 documentation 2025-04-13 16:22:33 +02:00
Alex
caa878002a
Remove redundant bit for Throat Spray (#6593) 2025-04-13 16:22:04 +02:00
Bassoonian
6a70f4f390
Turn battle string ids into enums (#6594) 2025-04-13 16:12:30 +02:00
Bassoonian
d62205f2fc
Converts some defines to enums (#6592) 2025-04-13 13:39:20 +02:00
hedara90
6a881f918a
Fix dynamax message (#6589)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 11:22:44 +02:00
cawtds
ee911ffbae
FakeRtc datetime and ResetRtcScreen day increments (#5695)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-04-12 13:17:58 -07:00
Pawkkie
540744024d
"Aerilate"-esque Ability Tests and Config (#6313) 2025-04-12 14:48:58 -04:00
Bassoonian
40419505f7
Add clarification for underlying math in EV caps (#6580) 2025-04-12 12:55:31 -04:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
Bassoonian
d86aedfd32 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr 2025-04-12 14:59:06 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-12 10:23:48 +02:00
Hedara
51c3709a56 Review comments 2025-04-12 08:58:23 +02:00
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +02:00
wiz1989
3d8b912087
Ability imposter (#6552) 2025-04-12 00:01:29 +02:00
psf
1ade433028
Added call to ItemId_GetDescription (#6582) 2025-04-11 23:59:43 +02:00
Hedara
66a6e92417 Fixed unused variables 2025-04-11 22:15:47 +02:00
Hedara
fff6bd3ed8 Removed legacy handling, fix if statment argument style 2025-04-11 21:27:49 +02:00
Hedara
3c2cc35158 Match expansion formatting for some preproc 2025-04-11 21:17:52 +02:00
Hedara
11df205d89 Merge branch 'nemo-merrp-fix' into merrps-dns 2025-04-11 18:50:24 +02:00
Bassoonian
3c8d5d1a57
Add hold effects for PLA Origin Trio items (#6578) 2025-04-11 16:38:08 +02:00
hedara90
a186ce1bff
Animation fixes from lucky adapted to expansion (#6452)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-11 13:15:13 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +02:00
hedara90
cf98d764ad
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-10 23:56:26 +02:00
Hedara
d78afca94f More shadow options and documentation 2025-04-10 22:41:38 +02:00
khbsd
c1ad43b1cc
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561) 2025-04-10 21:43:21 +02:00
Hedara
b075163c57 Cleanup and config options 2025-04-10 21:17:20 +02:00
khbsd
8bdad34211
fix: missing break statement (#6572) 2025-04-10 19:27:44 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
wiz1989
60a4e191ae
fixed damage calculations in CanTargetFaintAiWithMod() (#6446)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-10 14:56:49 +02:00
Martin Griffin
2a0d3fd070
Merge pull request #2118 from cawtds/linkdirection-range-x-access
Some checks failed
CI / build (push) Has been cancelled
Make linkDirection more robust to member reordering
2025-04-10 06:47:06 +01:00
Pawkkie
89da80b9d1
Ability access cleanup for #6550 (#6565) 2025-04-09 09:37:59 -04:00
pokemonmasteraaron
d890436b2a Fixed a compilation error if using AGBPrint as your log handler, misnamed AGBPrintfInit should be AGBPrintInit 2025-04-09 09:06:20 -04:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
Hedara
e419606a10 Merge branch 'upcoming' into merrps-dns 2025-04-09 12:48:18 +02:00
Hedara
c8f227903f Merge branch 'upcoming' into upcoming-master 2025-04-09 11:25:01 +02:00
Hedara
c57d21b7b2 Merge branch 'master' into upcoming-master 2025-04-09 11:22:07 +02:00
Alex
f364cf9e71
Alcremie Evolution clean up follow up (#6557) 2025-04-09 11:18:07 +02:00
Eduardo Quezada
8cf8de1344
Fixed Behemoth Blade/Bash handler not using form change tables (#6558) 2025-04-09 11:09:27 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +02:00
khbsd
26f28103ec
Add Time-Based Encounters (#6454) 2025-04-09 09:49:09 +02:00
Eduardo Quezada
2b417bfeed
Implemented Alcremie Evolution Method (#6530)
Co-authored-by: khbsd <khb.dev@gmail.com>
2025-04-08 19:50:21 +02:00
Pawkkie
54928726cb
AI smarter status handling (#6550) 2025-04-08 17:47:45 +02:00
psf
69f2f9f151
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477) 2025-04-08 16:21:32 +02:00
Alex
7bf156be0e
Refactors Move absorb / block function calls to remove redundancy (#6490)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-08 14:26:18 +02:00
Pawkkie
11d26af7a8 Initial attempt, doesn't see move effectiveness / damage 2025-04-08 00:15:28 -04:00
Pawkkie
d7a6e0bea8 Initialize move scores 2025-04-07 23:22:01 -04:00
SundayMoonday
bbe8bbc45b
Replaced Blue Sky background for Rock Field (#6516) 2025-04-07 11:04:21 +02:00
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)
Some checks failed
CI / build (push) Has been cancelled
2025-04-05 20:18:07 -04: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
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
AlexOn1ine
abfabb9699 revert fallback 2025-04-01 15:57:04 +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
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
Isaac Aronson
926a7437da
Add AI thinking cycle count display to frame count 2025-03-30 17:24:36 -05:00
Isaac Aronson
6f4a5ce1a0
Mark RTC/Flash save hint string as used 2025-03-30 14:14:40 -05: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
Hedara
a3a48c59b8 Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29 2025-03-29 14:21:29 +01:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack (#6459) 2025-03-29 14:04:01 +01:00
Alex
7ead90aeff
Fixs Aftermath ability popup message (#6491) 2025-03-29 09:45:59 +01:00
Isaac Aronson
56947be5d6
Fix union room typo 2025-03-28 10:26:01 -05:00
Alex
06c4a37b1f
Remove potential pitfall with saved damage for recoil moves (#6485) 2025-03-28 15:52:50 +01:00
Alex
ce3d6a924a
Fixes clear body type effect and clear amulet against protect effects (#6482) 2025-03-28 11:35:06 +01:00
PCG
92cb9ab642
Increase dex no digits from 3 to 4 (#6484) 2025-03-27 21:16:19 +01:00
psf
b60fcc9a72
Add B_ANIMATE_MON_AFTER_KO - mons animate after scoring a KO (#6451) 2025-03-26 11:39:25 +01:00
AlexOn1ine
ae640f0714 25-03-25 master to upcoming merge 2025-03-25 21:39:58 +01:00
Alex
5ec301f04a
Removes unused Special Status members (#6479) 2025-03-25 21:15:25 +01:00
hedara90
a36f838d76
AI gimmick check changed from checking trainer data to a BattleStruct field (#6478)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-25 20:01:34 +01:00
Alex
10412e1a47
Fixes protective pads against Protects secondary effects (#6474) 2025-03-25 16:30:15 +01:00
hedara90
ecab04d881
Sucker punch vs struggle (#6475)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-25 13:22:41 +01:00
Alex
1d6d6a2bdf
Fixes choice move locking at the wrong time (#6467) 2025-03-24 14:59:36 +01:00
hedara90
c82959dbe6
Removed unused debug EWRAM variables (#6468)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-24 14:58:57 +01:00
Hedara
521432b269 Renamed a berry tag variable
Some checks failed
CI / build (push) Has been cancelled
2025-03-24 13:47:47 +01:00
Hedara
4a1d273b08 Changed unused compressed pal include from u16 to u32 2025-03-24 11:41:49 +01:00
Alex
b93976c980
Fixes Cheek Pouch mutating damage (#6466) 2025-03-23 23:34:24 +01:00
ghoulslash
051adbdce2
Fix DexNav search level (#6421) 2025-03-23 11:29:51 -04:00
Pawkkie
50b0c5a2e3 WHOOPS 2025-03-22 20:29:03 -04:00
Pawkkie
11a7ea99f1 fix choice switches 2025-03-22 17:23:13 -04:00
kittenchilly
76bb903d06
Update Battle Debug menu with new AI flags (#6444) 2025-03-22 08:54:52 +01:00
Alex
c707df358e
Clean up AI code duplication and unify checks (#6348) 2025-03-20 22:50:01 +01:00
Pawkkie
4c18e88282
Improve "all moves bad" switching (#6453) 2025-03-20 16:43:56 +01:00
Alex
5c05715585
Adds move description battle config (#6364) 2025-03-20 10:12:37 +01:00
Bassoonian
9a23f19575
19-03-25 master to upcoming merge (#6450) 2025-03-20 09:57:05 +01:00
Alex
adc2c61fe8
Unifies dynamic move category checks (#6443) 2025-03-19 23:06:08 +01:00
AlexOn1ine
3c632b8b44 19-03-25 master to upcoming merge 2025-03-19 17:12:47 +01:00
Alex
4c4d043c13
Refactor the function IsAbilityPreventingEscape (#6439)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-19 16:09:36 +01:00
Alex
8dfd3bd278
Fixes Magic Coat message when move is bounced back (#6419)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-19 13:57:48 +01:00
Alex
21f1b3bf9d
Refactor HasWeatherEffect and IsUnnerveAbilityOnOpposingSide (#6441) 2025-03-19 13:56:58 +01:00
PhallenTree
cf9ee2caee
Fixes Toxic Spikes Absorbed message (#6448) 2025-03-19 13:46:23 +01:00
Pawkkie
411a236ce7
Fix AI using Scald / fire moves against frozen / frostbitten targets (#6442) 2025-03-19 09:32:59 +01:00
Alex
98a5fab898
Optimization / Clean up of AI move usability (#6332) 2025-03-18 23:42:07 -04:00
Raymond Dodge
7b6b9ab655
Remove casts in decoration.c (#2110)
Some checks failed
CI / build (push) Has been cancelled
2025-03-18 18:41:51 -04:00
Alex
6031bb2a78
Split ai function IsBattlerTrapped (#6438) 2025-03-18 12:00:11 -04:00
Alex
4193963096
Fixes Cotton Spore failing if one of the targets blocks it (#6418)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2025-03-18 15:41:37 +01:00
Alex
29fa249762
Allow the AI to see the second hit of Parental Bond (#6403) 2025-03-17 22:00:04 +01:00
Alex
0db9043c52
Rename absentBattlerFlags to absent (#6432) 2025-03-17 21:51:04 +01:00
Alex
f237b5fa1b
Fixes negative priority being blocked by dazzling abilities (#6433) 2025-03-17 21:48:50 +01:00
Pawkkie
3fa57381cd
Fix Focus Sash being considered in switch AI's hits to KO calcs (#6436) 2025-03-17 21:01:03 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
wiz1989
1e2aa18ffe
Added Dynamax/Gigantamax battle messages (#6440)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-17 19:16:43 +01:00
Alex
bd2d9f63ea
Fixes hazards not respecting tera types (#6431) 2025-03-16 22:05:21 -04:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435) 2025-03-16 23:10:20 +01:00
Deokishisu
eaf7549854
Replace Incorrect Slow Stairs Movement with Correct One (#6275) 2025-03-16 14:51:36 -07:00
Deokishisu
48d321e80b
Include Missed GetInteractedMetatileScript Entries for Mart & Center Signs (#6269) 2025-03-16 12:06:05 -07:00
Alex
079017549d
Wrong argumet usage in CalcCritChanceStage (#6429) 2025-03-16 14:58:46 +01:00
cawtds
5aa85e7b8d fix search level 2025-03-15 00:20:01 +01:00
Alex
5965c08326
Create move end Sheer Force (#6411) 2025-03-14 20:11:42 +01:00
hedara90
7af9984a4d
Fixed unfusion of traded materials (#6415)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-14 14:03:55 +01:00
Alex
7df3298534
Minor Recoil Effect refactor (#6409) 2025-03-14 12:43:45 +01:00
hedara90
b08a5fb15a
Tests for checking all move animations (#6297)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-13 13:46:48 +01:00
surskitty
7193909fa7
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather (#6149) 2025-03-12 21:31:45 +01:00
hedara90
3ca4ce2444
Fixed Parental Bond with two-turn attacks (#6408)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-12 20:54:32 +01:00
hedara90
4e01ce6993
Moved some AI stuff out of the battlestruct (#6405)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-11 21:23:02 +01:00
hedara90
a26a47cab8
Fixed AI_FLAG_CHECK_VIABILITY changing the toxic counter in some cases (#6402)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-11 13:58:49 +01:00
hedara90
40dd3a7688
Fix compile errors with OW_BATTLE_ONLY_FORMS set to FALSE (#6400)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-10 17:11:25 +01:00
PhallenTree
af3984bee4
Fixes gimmick icon flying off the screen (#6401) 2025-03-10 17:01:02 +01:00
Alex
4a1d08d760
Minor Clean up for AI_CalcDamage to remove some duplicate code (#6397)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-03-09 19:34:27 -04:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities (#6361) 2025-03-09 20:54:58 +01:00
cawtds
7eaaa1f8d4 remove/replace IsAlly leftovers 2025-03-09 15:05:05 +01:00
AlexOn1ine
06315ff084 first review batch 2025-03-08 21:24:22 +01:00
hedara90
a94b96a02f
B_FAST_INTRO_PKMN_TEXT fix (#6395)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-08 09:54:25 +01:00
Pawkkie
b12f32667f
Fix roll handling in AI damage calcs (#6396)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-08 09:53:14 +01:00
Alex
46b821c196
Fix damage roll order for AI calcs (#6356) 2025-03-07 12:40:40 -05:00
innocenthedgehog
752181bbcb
Switch AI considers Wind Rider (#6391) 2025-03-07 12:01:27 -05:00
Pawkkie
6500f4653f
Switch AI will factor in player's choice lock when determining hits to KO (#6343) 2025-03-07 11:44:59 +01:00
AlexOn1ine
ba3ebc70d5 Merge remote-tracking branch 'rhh/master' into 06-03-25-Merge 2025-03-06 18:08:55 +01:00
wiz1989
e0c7b63095
"no additional effect" text for status Z moves without effects (#6368) 2025-03-06 12:47:03 +01:00
Eduardo Quezada
3eae7a0c96
Gen 1's Special base stat (#6330) 2025-03-06 11:09:53 +01:00
kittenchilly
f747deb6ca
Fix Melmetal's weight (#6382) 2025-03-05 17:58:35 +01:00
Dana Yatsuta
ce99d6e75c
Fix roamers having 0 hp on repeat encounters (#6366) 2025-03-05 13:44:11 +01:00
Rachel
c7ac1a19df
Refactor teachable learnset helper (#6378) 2025-03-04 20:10:00 +01:00
Pawkkie
3398d75fe8
Improve AI's handling of player's Encore (#6305)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-04 14:26:07 +01:00
PhallenTree
fe4046a900
Fix tests 2025-03-04 11:34:07 +00:00
PhallenTree
e750dca08a
Reorder Dancer activation 2025-03-04 11:02:33 +00:00
Alex
abea5c0486
Fix Red Card overwriting gBattlerAttacker (#6376) 2025-03-03 23:18:55 +01:00
ghoulslash
d44eff4e0c fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly 2025-03-03 14:56:08 -05:00
Alex
69e845aee8
Fixed Ivy Cudgel types with type changes (#6369) 2025-03-03 16:49:33 +01:00
Hedara
6b9cc08372 Add Raging Bull fix 2025-03-03 16:20:18 +01:00
Hedara
7665324be0 Removed hard-coded types 2025-03-03 10:00:53 +01:00
Alex
8041f6978b
Small Code clean up in GetBattlerAbility (removes duplication) (#6362) 2025-03-03 09:00:27 +01:00
Alex
7a3acdf7fe
Change ability to abilityNum in CreateTrainerMon (#6370) 2025-03-03 08:58:37 +01:00
Hedara
682b7874b2 Missed an Ivy Cudgel 2025-03-02 22:11:23 +01:00
Hedara
3da228e998 Fixed Ivy Cudgel types with type changes 2025-03-02 22:00:51 +01:00
Ruby
ec8344c2ad
Fixed a missing ) in trainers.party comment block. (#6367) 2025-03-02 15:00:57 +01:00
Alex
17ff3e1391
Fixed Zacian/Zamazenta learning Iron head while already knowing (#6365) 2025-03-02 12:26:02 +01:00
Hedara
1331931a42 Fixed Zacian/Zamazenta learning Iron head while already knowing it in Crowned form 2025-03-02 10:42:12 +01:00
AlexOn1ine
134d1e79c7 review comments addressed 2025-02-28 22:42:53 +01:00
AlexOn1ine
0a333dbdc8 merge rhh/upcoming 2025-02-28 00:21:07 +01:00
surskitty
fb28206f21
Configuration to scale Critical Capture odds based on local Pokedex or estimated National Pokedex (#6250) 2025-02-27 15:16:16 -08:00
AlexOn1ine
fadcb46d4d revert and force push because broken commit 2025-02-28 00:04:40 +01:00
surskitty
5bd50e1e71
Fixing grammar of Berry Tree strings (#6355) 2025-02-27 18:21:09 +01:00
Pawkkie
da95f81fc4
Update AI_TryTo2HKO comment (#6349) 2025-02-27 18:01:03 +01:00
Eduardo Quezada
2b3589b44f
Moved Pokémon Jump types to gSpeciesInfo (#5602) 2025-02-27 07:46:14 -08:00
Hedara
e9347a0c9e Forgot to remove commented code 2025-02-26 22:10:23 +01:00
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
PhallenTree
b16aa37f67
Fixes fainted battler being able to select an action (#6339) 2025-02-26 15:42:54 +01:00
hedara90
56a3819b61
Fixed protect not resetting the counter in earlier gens (#6342)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-26 15:07:54 +01:00
Alex
cf481b1343
Fixes recoil moves causing recoil when absorbed (#6341) 2025-02-26 10:43:23 +01:00
hedara90
cf43787d72
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-25 22:28:22 +01:00
Alex
13acf18d74
Fixes effect paralyze not being absorbed by absorbing abilities (#6338) 2025-02-25 22:28:10 +01:00
Bivurnum
2a6fd24954
fix for multi 2vs1 opponent sends out too many mons bug (#6324) 2025-02-25 22:15:09 +01:00
hedara90
766b9b00ca
Fixed curing status2 with items in double battles (#6335)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-25 13:10:17 +01:00
Pawkkie
b109c4c36b
Fix Substitute / Shed Tail Switch AI (#6334) 2025-02-25 13:06:39 +01:00
PhallenTree
320c6cf11f
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327) 2025-02-23 20:50:52 +01:00
Eduardo Quezada
1895e6263b Applied a proper fix to blending 2025-02-23 16:44:05 -03:00
PhallenTree
9479b67964
Remove pursuitSwitchByMove and additional if statement (#6326) 2025-02-23 11:49:00 +01:00
Alex
5b4de20455
Fixes intimidate missing timing during a mega evo / switch (#6322)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-22 21:56:48 +01:00
hedara90
4cf219e5c7
Resized gimmick indicators to reduce VRAM usage (#6319)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 12:28:53 -03:00
hedara90
622a7f9a85
Refactor testing flags and vars to not conflict with user ones (#6301)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 15:32:39 +01:00
Pawkkie
b7df5b8c29
Fix Overzealous Absorber Switching (#6318) 2025-02-22 10:37:11 +01:00
Alex
3dd0f95ddd
Fixes Tera Shell activating on moves that have no effect on target (#6271) 2025-02-21 23:11:07 +01:00
Pawkkie
48fc44df31
Fix AI hold effect considerations (#6310) 2025-02-21 18:11:47 +01:00
Pawkkie
ba46524053
Big Root AI Fix (#6309) 2025-02-21 10:01:52 +01:00
Pawkkie
bf263efa4b
Fix AI hazard move handling, minor AI tweaks (#6311) 2025-02-21 09:58:14 +01:00
Eduardo Quezada
4492f02171 Fixed follower palettes not blending 2025-02-20 22:27:02 -03:00
Eduardo Quezada
ce71dc1adb Removed unused function 2025-02-20 19:52:23 -03:00
Eduardo Quezada
8c57172f2a Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-02-20 19:46:02 -03:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Eduardo Quezada
2428af66cd Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-02-20 19:17:59 -03:00
Alex
750098d5c9
Fixes Shell Bell for Spread Moves (#6303) 2025-02-20 10:14:54 +01:00
Alex
d695c74e39
Fixes inconsistency for Kings rock. (#6302) 2025-02-19 21:50:03 +01:00
Eduardo Quezada
ff098bc520
Reverted compound literal OW mon pic tables (#6216) 2025-02-19 19:17:59 +01:00
PhallenTree
5340dc8687
Fixes non-Ghost type Curse animation (#6299) 2025-02-19 18:09:06 +01:00
cawtds
5c3381b2f6
fix spit up getting skipped (#6295) 2025-02-19 12:51:11 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
Martin Griffin
d555f5c97f
Do not add TRAINER_FLAG_DOUBLE_BATTLE to recorded battles (#6285) 2025-02-17 15:56:15 +01:00
Alex
4d9659987d
Fixes Protean not restoring types after ai damage calcs (#6280) 2025-02-17 12:34:21 +01:00
Salem
444437274c
remove obsolete check for steven when retrieving partner name (#6283) 2025-02-17 10:02:28 +01:00
moostoet
7cd614a0cd
Fix AI wrongly thinking it strikes first with priority even if player is using priority themselves (#6274) 2025-02-15 16:48:26 -05:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection (#6267) 2025-02-14 13:47:02 +01:00
Alex
de8d25da55
Expand usage of IsBattlerAlly (rename from IsAlly) (#6251) 2025-02-14 12:31:21 +01:00
Alex
53727aa23d
Fixes ability Embody Aspect triggering multiple times (#6259)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-14 12:26:49 +01:00
Deokishisu
6d6b0f6c3b
Fix Extra task->tState++ and break in Task_DrawFieldMessageBox (#6261) 2025-02-14 10:11:37 +01:00
Alex
264e72c1a1
Use more accurate count in MovesInfo (#6260) 2025-02-13 20:22:10 -03:00
Alex
2b2d703c8a
Fixes Static Assert from pr #6174 (#6258) 2025-02-13 19:31:50 +01:00
Frank DeBlasio
d1b2b045d0
Moved sValidApprenticeMove into gMovesInfo (#6254) 2025-02-13 14:58:12 -03:00
moostoet
a42de40eb2
Add function to adjust AI scoring for generalized item effects (#6247) 2025-02-13 12:51:25 -05:00
Frank
a0a8434e26 Converted apprenctice IDs from hex to decimal 2025-02-13 12:13:22 -05:00
Eduardo Quezada
845679471f
Added missing Dream Eater and Reflect Type tests (#6245) 2025-02-13 17:32:08 +01:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Pawkkie
f851fb536a
Improve Yawn and Status Switching (#6202)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-13 17:34:40 +01:00
Alex
8448e745ea
Adds a follower flag define to disable followers on the fly (#6174) 2025-02-13 17:33:59 +01:00
Alex
0438b66f63
Minor Clean up for CanAbilityX. Follow up for #6183 (#6252) 2025-02-13 17:33:21 +01:00
Bassoonian
5aeeb3365f
Merrp merge (12th of February) (#6244) 2025-02-13 16:19:40 +01:00
Bassoonian
35324497a6
Update src/event_object_movement.c 2025-02-13 13:35:38 +01:00
hedara90
7d1bbf62e1
Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-13 10:23:06 +01:00
Zatsu
4f3326f3f4
fix for battle ui for add to party menu (#6229) (#6240) 2025-02-12 22:02:25 +01:00
hedara90
f20aebf878
Fixed multi battle forced switches (#6243)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-12 21:57:51 +01:00
AlexOn1ine
5ee5aa796a merge rhh/upcoming 2025-02-12 21:01:21 +01:00
AlexOn1ine
3c09e43a20 minor reviews 2025-02-12 18:51:50 +01:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00
Frank DeBlasio
0f0c8325c5
Replaced hardcoded numbers in DexNav with variables (#6241) 2025-02-12 09:44:45 -03:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Eduardo Quezada
860c2f6cbc
Remove whitespace from trainers data file (#6234) 2025-02-12 00:27:33 +01:00
Alex
075cd4e924
Revert unintentional change (#6239) 2025-02-12 00:27:00 +01:00
GriffinR
45d1c7ca7d
Merge pull request #2086 from DizzyEggg/patch-5
Some checks failed
CI / build (push) Has been cancelled
extern void * const gNullScriptPtr;
2025-02-11 14:45:19 -05:00
GriffinR
eb8eeaec48
Merge pull request #2094 from hedara90/pc-align-fix
Fixed potential unaligned issue in PC screen
2025-02-11 14:42:19 -05:00
GriffinR
a4350005e7
Merge pull request #2092 from AsparagusEduardo/patch-2
Fixed Gen 1/2's Transform "pink color" reference
2025-02-11 14:40:34 -05:00
Alex
cc9ca81c29
Add abstraction layer for battler positions (#6212) 2025-02-11 11:32:34 -05:00
AlexOn1ine
b4f17c7506 review comments 2025-02-11 12:06:16 +01:00
Hedara
e0e73983c7 Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11 2025-02-11 11:20:37 +01:00
明雅
846fe64789
Try a new solution to Fix Safari #6206 (#6228) 2025-02-10 15:55:57 +01:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Pawkkie
579fa6410d
Switch chance config support (#6187) 2025-02-10 00:30:54 +01:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +01:00
Eduardo Quezada
99cb40d896
Added test support for 5 battle configs (#5914)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-09 22:29:23 +01:00
Pawkkie
bd50fe6014
Fix AI switching in absorbing mon incorrectly (#6227) 2025-02-09 22:28:06 +01:00
Frank DeBlasio
3be1d1d91e
Consolidated Frontier teams into battle_frontier_trainers.h (#5892) 2025-02-09 22:17:10 +01:00
Eduardo Quezada
d510a3957d
Fixed Future Sight not being affected by Electrify (#6213) 2025-02-09 21:57:29 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
Alex
5f13f9545f
Redefine IsBattlerAlive in battle.h as a static inline (#6211) 2025-02-09 14:09:23 -05:00
Eduardo Quezada
621d2ef83d
Fixed missing move encapsulation in upcoming (#6226) 2025-02-09 20:03:53 +01:00
Eduardo Quezada
d3417b00a2
Fixed compilation error when turning P_GENDER_DIFFERENCES off (#6223) 2025-02-09 15:37:56 +01:00
AlexOn1ine
4babfd003e rhh merge/upcoming 2025-02-09 14:04:21 +01:00
明雅
d45a6487ab
Fix Using a Safari Ball crashes the game #6206 (#6220) 2025-02-09 09:50:01 -03:00
AlexOn1ine
f2bd88a7f9 EndTurnEffectsOrder Refactor 2025-02-09 13:48:08 +01:00
psf
a8c9857a56
Prevented fanfares from playing in headless mode (#6219) 2025-02-09 09:06:22 -03:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-09 00:54:58 +01:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195) 2025-02-08 12:51:22 -08:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
Eduardo Quezada
e29e1c6ca7 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-07 15:33:26 -03:00
Bassoonian
82b0eff16c
Fix typo in Nuzzle's description (#6209) 2025-02-07 15:26:16 -03:00
Pawkkie
e77fe32dec
Fix Choice'd mons referring to incorrect move when switching (#6204) 2025-02-07 16:42:08 +01:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03:00
Eduardo Quezada
473cf265a4
Fixed regression from master/upcoming merge (#6199) 2025-02-07 00:03:57 +01:00
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +01:00
Alex
4fd0c3a5be
Master to upcoming (#6194) 2025-02-06 19:11:10 +01:00