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
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
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
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
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
Eduardo Quezada
2b3589b44f
Moved Pokémon Jump types to gSpeciesInfo ( #5602 )
2025-02-27 07:46:14 -08:00
Hedara
8df457452a
Start of 1.12 cycle
2025-02-27 14:34:58 +01:00
Hedara
55bf368866
Merge branch 'upcoming' into upcoming-to-master-merge
2025-02-27 13:11:16 +01:00
Hedara
4f6733f45d
1.11.0 Release
2025-02-27 10:07:50 +01:00
Hedara
dfff36f643
1.10.3 Release
2025-02-27 09:59:22 +01:00
Hedara
06d31bc8ea
Merge branch 'master' into final-1.10-master-upcoming-merge
2025-02-26 22:07:10 +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
Pawkkie
b109c4c36b
Fix Substitute / Shed Tail Switch AI ( #6334 )
2025-02-25 13:06:39 +01:00
AlexOn1ine
df0389fdc0
clean up
2025-02-23 23:22:31 +01:00
hedara90
c3962c2d3b
Shifted the follower graphicsIds ( #6329 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-23 22:11:41 +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
7c78053a8c
Clean up leftover from simu hp reduction development ( #6323 )
2025-02-22 21:56:30 +01: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
bf263efa4b
Fix AI hazard move handling, minor AI tweaks ( #6311 )
2025-02-21 09:58:14 +01: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
82f6d477b6
Fix padding amount in MoveInfo ( #6307 )
2025-02-20 17:03:01 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up ( #6272 )
2025-02-17 22:07:30 +01: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
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
Eduardo Quezada
9c4fbbf274
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-13 13:06:32 -03: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
Hedara
0da3e49889
Review comments
2025-02-13 10:36:52 +01:00
hedara90
9aea7c8e3a
Changed bit order for follower graphicsId creation ( #6249 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-12 23:36:37 +01:00
Zatsu
4f3326f3f4
fix for battle ui for add to party menu ( #6229 ) ( #6240 )
2025-02-12 22:02:25 +01:00
AlexOn1ine
5ee5aa796a
merge rhh/upcoming
2025-02-12 21:01:21 +01:00
AlexOn1ine
f8b45028db
fix grassy terrain healing
2025-02-12 19:33:41 +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
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
Alex
72de12609c
Fixes BATTLER_TURN_DAMAGED battler id ( #6236 )
2025-02-11 16:18:00 -03: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
Ariel A
c8fb56d73b
Merge branch 'followers' into followers-expanded-id
2025-02-10 00:24:50 -05:00
Ariel A
a4e032c28d
Merge branch 'followers' into lighting
2025-02-10 00:19:48 -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
hedara90
174bc2f29f
Fixed typo in requests_effects ( #6215 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-09 16:59:31 -05: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
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
AlexOn1ine
4babfd003e
rhh merge/upcoming
2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9
EndTurnEffectsOrder Refactor
2025-02-09 13:48:08 +01: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
Eduardo Quezada
b51598c14d
Removed Trainer Slides footgun ( #6205 )
2025-02-07 13:30:57 +01:00
Alex
765a12f520
Convert max effects to normal move effects ( #6143 )
2025-02-06 21:02:39 -03:00
hedara90
f9d1fdcf4c
Follower Object Event refactor ( #6129 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +01:00
Hedara
27da389d1e
Merge branch 'master' into master-to-upcoming
2025-02-06 13:05:02 +01:00
Pawkkie
4359cbb77c
SwitchType enum to clean up GetMostSuitableMonToSwitchInto ( #6184 )
2025-02-05 16:49:53 +01:00
ghoulslash
dc21befcc9
CanAbilityX Function Cleanup ( #6183 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-05 16:48:51 +01:00
hedara90
cad1a37566
Tachyon Cutter and Salt Cure animations ( #6182 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 15:27:21 +01:00
Alex
b90b1e2546
Clean up - Add ability args instead of calcing the ability again ( #6186 )
2025-02-04 18:04:05 -05:00
GriffinR
cdadd7d2ed
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
tertu
14178edfe3
Don't use SeedRng some places where it isn't necessary ( #6156 )
2025-02-03 20:03:13 +01:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly ( #4985 )
2025-02-03 17:03:29 +01:00
Eduardo Quezada
64c5113b23
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-02 14:18:13 -03:00
Alex
f8c2e860d7
Remove unused PainSplit scripting global ( #6164 )
2025-02-02 14:50:39 +01:00
Eduardo Quezada
7c6eda21b1
Added missing in-battle "Move Info" button prompt ( #6155 )
2025-02-01 18:47:36 +01:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs ( #6154 )
2025-01-31 22:02:26 +01:00
Eduardo Quezada
ee1b75614d
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-30 22:46:06 -03:00
khbsd
4fc56128d0
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites ( #5874 )
...
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2025-01-30 22:29:20 -03:00
Eduardo Quezada
1c3cabb52a
Fix typo
2025-01-30 18:46:06 -03:00
Eduardo Quezada
370cfd5bb4
Begin 1.10.3 cycle
2025-01-30 18:40:03 -03:00
Eduardo Quezada
397e98b954
Version 1.10.2 ( #6144 )
2025-01-30 18:38:28 -03:00
Alex
32eb5dfba5
Remove global sBattler_AI ( #6128 )
2025-01-29 19:58:16 +01:00
Alex
94c98e6233
Clean up follow up for Simultaneous Reduction HP ( #6139 )
2025-01-29 19:39:19 +01:00
Alex
6432027f6b
Replace BattleStruct members quickClawRandom/quickDrawRandom with locals ( #6136 )
2025-01-29 07:02:40 -03:00
bassforte123
72edeeffad
Update pokemon.h with nature comments ( #6133 )
2025-01-28 21:37:02 +01:00
Alex
49cbebd212
Remove formToChangeInto (Unused) ( #6137 )
2025-01-28 17:11:11 -03:00
Eduardo Quezada
927bb8f833
Fixed AI not handling type effectiveness beyond x8 ( #6127 )
2025-01-28 19:16:10 +01:00
DizzyEggg
b2448ea002
Fix upcoming not working on no cash ( #6121 )
2025-01-26 20:25:57 -03:00
Frank DeBlasio
9b96462204
Consolidated contest opponent filters into gContestOpponents ( #6119 )
2025-01-26 23:12:49 +01:00
kittenchilly
058bf58b7b
Match current gen behavior for battle environment after fishing ( #6099 )
2025-01-26 22:39:14 +01:00
Eduardo Quezada
be74612b9e
u32 in FadeScreenHardware
2025-01-26 17:17:37 -03:00
Eduardo Quezada
3fc9b0195d
Cleaned up code to align with previous review comments
2025-01-26 17:14:00 -03:00
Eduardo Quezada
11bdbfb658
Fix compile issues
2025-01-26 16:35:05 -03:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
PhallenTree
4158f9251f
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter ( #6109 )
2025-01-26 13:06:11 +01:00
hedara90
e1e3bcfa91
Tera starstorm ( #6073 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Ariel A
c1d105c31c
Merge branch 'lighting' into lighting-expanded-id
2025-01-25 21:45:23 -05:00
Ariel A
bc034aaf73
Merge branch 'followers-expanded-id' into lighting-expanded-id
2025-01-25 21:42:02 -05:00
Ariel A
090c4f3936
feat: hardware fades now affect BLDALPHA too
2025-01-25 20:57:30 -05:00
Frank DeBlasio
4e8ddebb8d
Updated trainer pic tutorial ( #6049 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-01-25 19:36:19 -05:00
Pawkkie
43e41bbed8
Add Code Entry functionality ( #5951 )
2025-01-25 22:03:08 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Alex
77b677dbf9
Introduces BattleTurnCounter to simplfy timer checks ( #6080 )
2025-01-25 14:26:38 -05:00
hedara90
88986baf5f
Trainer Party Pools ( #5731 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-25 13:28:46 +01:00
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
Eduardo Quezada
cd84e07341
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-23 23:01:25 -03:00
psf
b109aa0c92
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide ( #6018 )
2025-01-23 16:28:33 +01:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer ( #6029 )
2025-01-23 09:47:14 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +01:00
hedara90
2a8f4b03dc
Revert "Revert map related enum conversion" ( #6079 )
2025-01-22 21:25:24 +01:00
hedara90
2b9c5fe4e7
Revert map related enum conversion ( #6078 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 19:37:56 +01:00
Eduardo Quezada
af884b1be4
Cleaned up Debug Menu ( #6070 )
2025-01-22 15:27:08 +01:00
hedara90
e8d3b4163f
Trainerslide animation fix ( #6040 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 14:50:23 +01:00
Pawkkie
3c5bd4d16c
Return the universe to a state of balanced quilibrium ( #6074 )
2025-01-21 18:25:15 -05:00
Pawkkie
ea4434db2a
Switch trapping AI will consider Trace ( #6059 )
2025-01-22 00:07:15 +01:00
Alex
f2840cb047
Fixes Eject Pack triggering twice on Intimidate ( #6072 )
2025-01-21 17:58:52 -05:00
Eduardo Quezada
ed505cfb5f
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction ( #6023 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-21 21:43:54 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Alex
b1831daa98
Adds static assert for DamageCalculationData ( #6063 )
2025-01-21 21:15:25 +01:00
Alex
ac9c8ac3bb
Replace WEATHER_HAS_EFFECT with HasWeatherEffect ( #6069 )
2025-01-21 08:43:45 +01:00
Alex
27c8ec07c2
Documentation for DisableStruct ( #6066 )
2025-01-20 16:41:42 -05:00
Pawkkie
7d39dd4aae
Add AI_FLAG_PREDICT_INCOMING_MON: AI will score against predicted switchin if predicting switch ( #6037 )
2025-01-20 20:54:38 +01:00
khbsd
52666fb545
IV/EV Info on Summary Screen ( #6027 )
2025-01-20 09:41:31 +01:00
Eduardo Quezada
a756bb501c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality ( #5048 )
2025-01-18 23:19:06 +01:00
AERDU
e4e4460636
fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 ( #6032 )
2025-01-18 19:54:20 +01:00
Alex
9ed3b176f0
Pret merge (17 of January) ( #6045 )
2025-01-18 19:53:29 +01:00
Bassoonian
243900cdbb
Rename DexNav flags and vars ( #6044 )
2025-01-18 14:44:40 +01:00
Bassoonian
db5dc85b70
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
2025-01-18 13:07:05 +01:00
Bassoonian
cc9a4d34c6
Fix tests not building
2025-01-18 13:07:01 +01:00
Bassoonian
199760a6d3
Add known failing learnset cap test ( #6046 )
2025-01-17 21:04:46 -05:00
DizzyEggg
e83f7c79eb
Fix conflicting types for rotating gate functions ( #2087 )
CI / build (push) Waiting to run
2025-01-17 18:19:21 -05:00
DizzyEggg
0a436d580e
Extern gSprites and gOamMatrices with known array size ( #2090 )
2025-01-17 18:18:17 -05:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
Eduardo Quezada
6162628104
A bit more of addressing
2025-01-17 19:25:29 -03:00
hedara90
3bcfa355eb
Config for move slot rearrangement in battle ( #6017 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-17 23:03:01 +01:00
Eduardo Quezada
ffc8903f93
More review addressing
2025-01-17 18:47:38 -03:00
Eduardo Quezada
c363c28b22
Addressing a bunch of small things
2025-01-17 18:21:48 -03:00
Bassoonian
bcf9a1eff8
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music ( #2053 )
...
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
Eduardo Quezada
cacd07db9a
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-17 13:49:32 -03:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports ( #6041 )
2025-01-17 14:39:52 -03:00
Pawkkie
465d30fbd0
Add AI_FLAG_PREDICT_SWITCH ( #6028 )
2025-01-16 21:43:16 +01:00
cawtds
75d5edad08
Fix UB when accessing move result flags ( #6030 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-15 21:30:25 +01:00
ghoulslash
fd26d3a406
Fix Redirection Abilities Not Drawing in Ally Moves ( #6026 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-15 15:20:31 +01:00
Martin Griffin
ed0c9a4671
Restore lock/lockall/locktrainer/release/releaseall in triggers ( #5976 )
2025-01-15 10:22:26 -03:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep ( #6019 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-15 14:07:12 +01:00
Pawkkie
e8dd8da5f7
Add AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE ( #6025 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-14 14:13:48 -05:00
Eduardo Quezada
ce40c3356c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-12 08:42:57 -03:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues ( #6005 )
2025-01-12 09:49:19 +01:00
Alex
ddef67bbb1
Future Sight Innards Out follow up for upcoming ( #5998 )
2025-01-12 00:25:50 +01:00
Alex
8f34c76395
Removes Resource Flags and moves fields to DisableStruct ( #5945 )
2025-01-11 09:39:10 -03:00
DizzyEggg
f15d89893e
Allow Party Menu with 0 Pokemon ( #5997 )
2025-01-11 12:14:31 +01:00
Eduardo Quezada
8821779815
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-11 08:07:15 -03:00
Alex
6e5f40d506
Introduces BattlerState struct for the Battle Engine ( #5954 )
2025-01-11 07:12:22 -03:00
Eduardo Quezada
21bc5cfd30
Debug menu and createmon additions/cleanup ( #5994 )
2025-01-11 10:07:47 +01:00
Eduardo Quezada
c33c38e020
Remove form change function footguns ( #5995 )
2025-01-11 09:57:39 +01:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs ( #5964 )
2025-01-10 17:07:32 -05:00
Alex
75a2d419e1
Follo up for Innards Out / Future Sight interaction ( #5967 )
2025-01-10 16:59:37 +01:00
Alex
e264fa6fc0
Removed OW_AUTO_SIGNPOST ( #5978 )
2025-01-08 16:14:38 -08:00
psf
81d877339c
Removed OW_AUTO_SIGNPOST ( #5974 )
2025-01-08 21:36:50 +01:00
Pawkkie
b5f539ed21
Rename AI_FLAG_PREFER_STRONGEST_MOVE ( #5972 )
2025-01-08 14:00:20 +01:00
Martin Griffin
bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention ( #5033 )
...
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.
All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.
Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.
Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
effect.
2. Immediately run triggers if they only affect flags/vars. This removes
the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
warp scripts onto the global script context if they would block
(approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
not see the player if the script has no effect, and the trainer will
use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
cant_see_if_* commands have been introduced so that scripts are able
to do something when the player interacts with the trainer even if
that trainer wouldn't see them.
2025-01-08 10:27:00 +00:00
Alex
5391b451ae
Shell Bell Clean up / Simplification and Tests ( #5924 )
2025-01-07 21:50:23 +01:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations ( #5933 )
2025-01-07 20:08:31 +01:00
wiz1989
5bfc25a4ff
changed data according to suggestions from the PR
2025-01-07 15:33:22 +01:00
wiz1989
04da838d88
Innards Out and Future Sight interaction
2025-01-07 14:00:09 +01:00
shachar700
a0e8753083
Update vars.h (cleanup)
...
Removed an extra are
2025-01-06 22:17:24 +02:00
Alex
5317371fea
Last fix for Sparkling Aria / Covert Cloak / Shield Dust interaction ( #5956 )
2025-01-06 12:03:41 +01:00
Eduardo Quezada
40ba25dd3e
Converted 2 various to callnative ( #5950 )
2025-01-05 17:47:49 +01:00
shachar700
cbd0b3ef0c
Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 ( #5952 )
2025-01-05 16:45:21 +01:00
khbsd
76964dd96a
Fly from Pokenav ( #5679 )
2025-01-05 00:24:58 +01:00
Eduardo Quezada
d7bbb2e628
Easy customizable Hidden Move types ( #5872 )
2025-01-04 21:42:14 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC ( #5337 )
...
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-01-04 14:25:03 +01:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
ghoulslash
401df8da4d
move overwrittenAbilities field to DisableStruct ( #5946 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-03 18:17:23 +01:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
Eduardo Quezada
161c3aadea
OW_OBJECT_SUBPRIORITY
2025-01-03 13:51:11 -03:00
Bassoonian
9199b6f3cc
Adds Dexnav ( #4818 )
2025-01-03 14:19:02 +01:00
Alex
ec1876b826
Remove EWRAM gHpDealt (not needed anymore) ( #5925 )
2025-01-02 23:37:58 +01:00
ghoulslash
9707d09f79
some more Dexnav -> DexNav
2025-01-02 10:13:06 -05:00
Philipp AUER
94fba81a90
Initialize m4a and IRQ handler in a loaded section ( #5912 )
...
Co-authored-by: sbird <sbird@no.tld>
2025-01-02 15:11:32 +01:00
ghoulslash
7a9e847fd4
some clean up
2025-01-02 09:00:56 -05:00
ghoulslash
d8ea4fa1ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2025-01-02 08:28:21 -05:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix ( #5928 )
2025-01-01 21:41:42 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
e040dcb0b4
Begin 1.10.2 cycle
2025-01-01 16:20:40 -03:00
Eduardo Quezada
89699939de
Version 1.10.1
2025-01-01 16:17:49 -03:00
Eduardo Quezada
6b8665d08f
Speed up tests in headless mode ( #5889 )
2025-01-01 10:24:23 +01:00
Ariel A
a6ef9c7577
Merge branch 'followers' into followers-expanded-id
2025-01-01 00:39:14 -05:00
Ariel A
4047f9b764
feat: added FadeScreenHardware utility
2025-01-01 00:37:35 -05:00
Ariel A
faf773a54b
feat: added time-blend override
2025-01-01 00:37:21 -05:00
Ariel A
a515cb3c6b
Merge branch 'followers' into lighting
2025-01-01 00:37:09 -05:00
Eduardo Quezada
e1275594c5
Renamed OW type effectiveness function for clarity ( #5917 )
2024-12-31 22:55:42 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Alex
51cfb96fd5
Fixes Sparkling Aria Shield Dust / Covert Cloak interaction ( #5911 )
2024-12-31 12:52:16 +01:00
Ariel A
3fffb9fac6
feat: added configuration to restrict following pokemon. Closes #42
2024-12-30 21:38:18 -05:00
Alex
9d30299148
Fixes Stance Change, Sleep Talk interaction ( #5909 )
2024-12-31 00:38:01 +01:00
Bassoonian
bf125c8f5e
Fix wrong value for NUM_MOVE_EFFECTS ( #5913 )
2024-12-30 23:51:48 +01:00
Alex
3db351359a
Clean up redundancy for mugshots ( #5906 )
2024-12-30 18:32:21 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses ( #5899 )
2024-12-30 09:18:23 +01:00
Alex
f864bf8b70
Adds Generational config for Magic Guard (Fix for Gen4+) ( #5893 )
2024-12-30 09:01:20 +01:00
Eduardo Quezada
009de5c98c
Setting Battle configs during tests ( #5803 )
...
Co-authored-by: sbird <sbird@no.tld>
2024-12-29 23:28:39 +01:00
Hedara
2088f2a12d
Merge branch 'master' into master-upcoming
2024-12-29 21:43:07 +01:00
Eduardo Quezada
7ddb4cdc1b
Fixed TODO tests not showing up when filtering by name ( #5894 )
2024-12-29 14:18:33 +01:00
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1
refactor done
2024-12-28 20:55:59 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
AlexOn1ine
0bb86e4437
struct
2024-12-28 10:23:28 +01:00
Alex
5900a01061
Atk Canceller refactor / reorder / clean up ( #5885 )
2024-12-27 21:14:05 +01:00
Eduardo Quezada
50d325f081
Slight contest documentation ( #2078 )
CI / build (push) Has been cancelled
2024-12-27 11:09:33 -05:00
Eduardo Quezada
91c7bd9e53
Fixed givemon not respecting perfect IVs for species ( #5873 )
2024-12-26 21:22:45 +01:00
AlexOn1ine
9c34634dd6
Draft Change
2024-12-25 11:03:32 +01:00
DizzyEggg
b1dbc6e9b2
Fix ASSUMPTIONS not working ( #5869 )
2024-12-24 06:46:40 -03:00
Alex
8edf14423a
Refactors argument into a union ( #5853 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-23 15:51:35 -03:00
Eduardo Quezada
f9fed98665
Fixed MOVE_EFFECT_FREEZE_OR_FROSTBITE not being usable in battle scripts ( #5859 )
2024-12-22 23:39:48 +01:00
Bassoonian
5560f339d0
Remove unused various ( #5851 )
2024-12-21 20:26:46 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
Eduardo Quezada
1e6628b78d
Address Review comments Pt2
2024-12-21 10:49:59 -03:00
Eduardo Quezada
dbc3cc28b8
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-21 09:31:23 -03:00
Eduardo Quezada
25075239a2
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-21 08:46:33 -03:00
Eduardo Quezada
e175c5aca8
Changes Various defines to an Enum ( #5840 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-12-21 11:48:31 +01:00
AlexOn1ine
573200d56a
nobody saw anything but again
2024-12-21 11:23:30 +01:00
AlexOn1ine
ff4c2aaf78
nobody saw anything
2024-12-21 10:24:34 +01:00
AlexOn1ine
71318eca5f
Revert weather order
2024-12-21 10:04:16 +01:00
Eduardo Quezada
53aebc34dd
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-20 20:48:13 -03:00
AlexOn1ine
2c419ccb57
review comments
2024-12-20 22:43:05 +01:00
Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Eduardo Quezada
05f300f6cc
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-20 15:22:14 -03:00
Bassoonian
5cc0b35d81
Replace power checks with IS_MOVE_STATUS ( #5820 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-20 08:20:46 -03:00
hedara90
e579333427
Egg cycle length fix ( #5828 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-20 11:23:51 +01:00
Alex
f27bf843cb
Changes Various defines to an Enum ( #5839 )
2024-12-20 10:49:40 +01:00
AlexOn1ine
eb4427db94
primal weather fix
2024-12-19 21:41:32 +01:00
AlexOn1ine
99fef0260f
Battle Weather Refactor
2024-12-19 20:50:08 +01:00
PhallenTree
f4a0cc0055
Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles ( #5829 )
2024-12-19 13:51:03 +01:00
Alex
a2aba3f86a
Changes target TURN_DAMAGED and MAX_HP to inlines ( #5822 )
2024-12-17 17:21:12 -05:00
Eduardo Quezada
bcc65e74a6
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-14 13:03:16 -03:00
Alex
4bff9f8ee9
Fixes simu hp reduction when no partner was on field ( #5799 )
2024-12-10 21:48:31 +01:00
PhallenTree
3ad5de5fef
Adds missing Friend Ball friendship bonus upon catching ( #5795 )
2024-12-10 08:26:23 -03:00