Commit Graph

7223 Commits

Author SHA1 Message Date
Alex
a4bfbea3cb
Revert wrongly done Embody Aspect fix (#6607) 2025-04-14 00:17:10 +02:00
Alex
a6c73a5885
Adjust enum AIScore (#6598) 2025-04-13 18:54:02 +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
Bassoonian
d173e42372
Remove redundant AI defines (#6590) 2025-04-13 11:22:14 +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
563e094ea8
Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579) 2025-04-12 12:56:30 -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
Hedara
3c2cc35158 Match expansion formatting for some preproc 2025-04-11 21:17:52 +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
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
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
hedara90
3d68061f23
Updated move animation tests (#6554) 2025-04-09 12:17:57 +02:00
Hedara
c8f227903f Merge branch 'upcoming' into upcoming-master 2025-04-09 11:25:01 +02:00
Alex
f364cf9e71
Alcremie Evolution clean up follow up (#6557) 2025-04-09 11:18:07 +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
SundayMoonday
bbe8bbc45b
Replaced Blue Sky background for Rock Field (#6516) 2025-04-07 11:04:21 +02:00
AlexOn1ine
e8cc3c81f8 conflicts 2025-04-06 14:59:12 +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
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
Isaac Aronson
74e84da571
Remove NDEBUG guard on cycle counter functions 2025-03-31 13:11:18 -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
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
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
Pawkkie
1c0e5bb0e1 fix hit escape switching 2025-03-29 14:18:20 -04: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
hedara90
b0c7d1a8ee
Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-28 21:43:04 +01:00
Martin Griffin
71a5542168
metaprogram.h without global.h (#6469) 2025-03-28 21:21:58 +01:00
Alex
ce3d6a924a
Fixes clear body type effect and clear amulet against protect effects (#6482) 2025-03-28 11:35:06 +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
Hedara
521432b269 Renamed a berry tag variable
Some checks failed
CI / build (push) Has been cancelled
2025-03-24 13:47:47 +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
hedara90
08f11ca5c1
Update the All Move Animations test (#6460)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-21 22:33:03 +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
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
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
0db9043c52
Rename absentBattlerFlags to absent (#6432) 2025-03-17 21:51:04 +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
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
khbsd
816ed0d963
Low Health Beeps Configuration (#6328) 2025-03-15 22:02:48 -07:00
GriffinR
04eb22f4ea Fix offset for towerInterview in BattleFrontier
Some checks failed
CI / build (push) Has been cancelled
2025-03-15 17:45:42 -04: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
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
AlexOn1ine
4adb908a6b review comments 2025-03-12 23:41:28 +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
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
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
dd8606d577 fix timers 2025-03-08 22:26:03 +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
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
PhallenTree
e750dca08a
Reorder Dancer activation 2025-03-04 11:02:33 +00:00