Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
SarnPoke
622dead80c
Shed Tail Retarget ( #5275 )
...
Re-targets Shed Tail PR to upcoming
2024-08-28 13:40:35 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
psf
e7023088ed
Merge branch 'upcoming' into scriptCommands
2024-08-27 21:31:14 -07:00
psf
23134cec85
Merge branch 'upcoming' into signpost
2024-08-27 21:31:07 -07:00
psf
be4fbf80ed
Merge branch 'upcoming' into stairWarps
2024-08-27 21:30:32 -07:00
pkmnsnfrn
04faf370e6
Cleaned up and reordered functions
2024-08-27 20:56:09 -07:00
Alex
98dbf3a575
Fixes Charged up status ( #5274 )
...
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. ( #5273 )
2024-08-27 14:33:58 +02:00
Pawkkie
0bb43626af
Chilly Reception AI ( #5271 )
2024-08-26 23:46:42 -04:00
kittenchilly
74a790f09c
Chilly Reception AI
2024-08-26 19:11:33 -05:00
Pawkkie
e9c8bd0548
Revert "Chilly Reception AI" ( #5270 )
2024-08-26 16:58:15 -07:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Pawkkie
a9f31dcc4f
Chilly Reception AI ( #5265 )
2024-08-26 18:57:17 -04:00
kittenchilly
03b0d066ce
Update battle_ai_main.c
2024-08-26 16:50:58 -05:00
hedara90
2e43ffd5f7
Fixed Snore not hitting twice with Parental Bond ( #5264 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 21:59:39 +02:00
Eduardo Quezada
c075d8e6b1
Fixed test system documentation ( #5266 )
2024-08-26 21:59:01 +02:00
psf
b6299ac4ce
Fix a display issue with B_SHOW_TYPES ( #5201 )
...
* Moved HandleInputChooseTarget and ShowEntireFieldTargets to non-static and added them as cases to ShouldHideTypeIcon
* Made ShouldHideTypeIcon easier to parse
* Made ShouldHideTypeIcon a for loop
* Fixed identation
* Made showTypesControllerFuncs a static const array per https://github.com/rh-hideout/pokeemerald-expansion/pull/5201\#discussion_r1730336265
2024-08-26 15:16:56 -04:00
kittenchilly
80ad7f15cc
Chilly Reception AI
2024-08-26 13:09:50 -05:00
kittenchilly
03e0472cbe
Add I_REPEL_INCLUDE_FAINTED config and behavior ( #5239 )
...
* Add I_REPEL_INCLUDE_FAINTED config
* Update src/wild_encounter.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update wild_encounter.c
* Update wild_encounter.c
* Update src/wild_encounter.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-26 15:58:12 +02:00
GriffinR
bc7c46ffe2
Merge pull request #2026 from mrgriffin/preproc-enum-arbitrary-expr
...
preproc: support arbitrary expressions in enums
2024-08-26 00:02:41 -04:00
pkmnsnfrn
fe428fc89b
original merge of branch
2024-08-25 16:46:22 -07:00
kittenchilly
8d47db6160
Add Population Bomb animation ( #5194 )
...
* Population Bomb animation
* Update battle_anim_new.c
* Update battle_anim_new.c
2024-08-25 23:39:25 +02:00
SarnPoke
5de0f3cb4a
Add Anger Point/Crit Moves Doubles AI Interaction ( #5244 )
...
* Add Anger Point/Crit Moves AI Interaction
Encourages the AI to use an "always crit" move on its partner, if that partner has the Anger Point ability.
* Add OHKO check
Makes sure that the crit move does not OHKO the partner with Anger Point.
* Fix mistake
Fixes small mistake
* Add Speed Check
Checks if mon is faster than its Anger Point partner when scoring.
2024-08-25 23:38:40 +02:00
kittenchilly
afd18f06b4
Fix switch out move message ( #5258 )
2024-08-25 23:29:33 +02:00
Salem
ceec17ec7b
remove unused bs signature ( #5257 )
2024-08-25 23:13:40 +02:00
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes ( #5252 )
2024-08-25 09:06:03 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix ( #5245 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-25 11:20:26 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
Eduardo Quezada
abf60e9c64
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-24 19:44:35 -04:00
Galaxeeh
68e470f84a
Dynamic Move Display fixes ( #5251 )
...
* Weatherball fire type check changed to WEATHER_DROUGHT, added overworld check for field terrain set by weather dependent on configs
* Update src/pokemon.c
FRICKIN INDENTS LMAO
Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>
---------
Co-authored-by: Eduardo Quezada <93919226+equezada-jej@users.noreply.github.com>
2024-08-24 14:51:18 -04:00
hedara90
572972235e
Disguise tests ( #5249 )
...
* Start new Disguise tests
* Finished disguise tests
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-24 20:22:50 +02:00
tertu
17f68563eb
Remove support for the original LCG random number generator ( #5078 )
2024-08-24 10:07:00 -07:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests ( #5242 )
...
* Adaptability, Aerilate, Aftermath tests
* Update test/battle/ability/aerilate.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-24 10:53:19 -04:00
PhallenTree
85fe398b50
Fix Starting Status being passed on to future wild battles ( #5248 )
2024-08-24 14:28:24 +02:00
Salem
4208da1e22
add missing break for poison puppeteer ( #5243 )
2024-08-23 18:21:40 +02:00
Cafei
4cc193ebf1
A bunch of fixes for follower Pokemon sprites ( #5241 )
2024-08-23 10:38:09 +02:00
Martin Griffin
ac28fc52e5
Merge pull request #2007 from cawtds/ub-fix-battle-transition
...
UB fix in battle_transition.c
2024-08-21 19:08:07 +01:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
...
Clean up defines lacking spaces
2024-08-21 19:04:12 +01:00
Martin Griffin
ea726eee31
Merge pull request #2024 from luckytyphlosion/master
...
Slight storage system documentation
2024-08-21 19:02:03 +01:00
Alex
5a320f94d2
Fixes Hyperspace Fury softlock ( #5237 )
...
Fixes #5236
2024-08-21 11:43:57 -04:00
Eduardo Quezada
77148f83a6
DoBattleIntro state documentation ( #5231 )
...
* DoBattleIntro state documentation
* Removed unused state
* Update src/battle_main.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Fixed state jumps
* BattleStruct state uses enum
* Renamed state enums
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-21 15:57:28 +02:00
Martin Griffin
5c55cc3748
[preproc] support arbitrary expressions in enums
2024-08-21 07:50:41 +01:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes ( #5142 )
...
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
hedara90
d379ffef3e
Fixed Confide+Crafty Shield interaction ( #5202 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-20 08:24:42 -04:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -04:00
psf
af12697845
Adds OW_BERRY_IMMORTAL ( #5187 )
...
* Added OW_BERRY_IMMORTAL
Added cases for OW_BERRY_IMMORTAL
* removed one preproc
* removed other preproc
* Fixed identation
* Set config to FALSE
* Update include/config/overworld.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187#discussion_r1720747388
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652
* Update include/config/overworld.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-20 07:23:33 -04:00
Pawkkie
a111ac496d
Fix typos ( #5221 )
...
Fix typos in move description of Decorate, Collision Course and Electro Drift
2024-08-20 12:44:27 +02:00
