Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
luckytyphlosion
a55c75d350
Get rid of common syms ( #2040 )
2024-10-14 23:52:11 -04:00
mid-kid
253d3dd7ef
Remove unnecessary looping for rule generation and unroll macros ( #2046 )
2024-10-14 23:47:07 -04:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
2024-10-12 23:50:12 -04:00
GriffinR
b6892f5b67
Let scaninc ignore empty C files
2024-10-11 15:03:38 -04:00
mid-kid
2c7964dbc2
Fix deleting files with dependency files ( #2045 )
2024-10-11 14:33:32 -04:00
Martin Griffin
fcc067e515
[preproc] support C23 enum underlying type syntax ( #2043 )
2024-10-11 13:50:26 -04:00
GriffinR
6d24d8a78f
Fix libpng installation for workflow on Ubuntu 24.04
2024-10-11 13:29:16 -04:00
Martin Griffin
6395d55b43
Merge pull request #2044 from AreaZR/Excessive
...
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
2024-10-10 20:26:12 +01:00
Rose
9ad0018c17
Fix typo: | should be || in Task_TryFieldPoisonWhiteOut
...
Yes, this is honestly overkill, as it doesn't actually fix any behavioral bugs, but I was suggested to do this. This was a typo made in the source that GameFreak made, and the compiler warns against this. I opened a PR in pokeemerald expansion and was suggested to open one here.
2024-10-10 10:27:33 -04:00
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
PhallenTree
91325e83c1
Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine ( #5447 )
...
* Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost
* Protosynthesis + Quark Drive tests
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-04 11:00:12 +02:00
ghoulslash
be5f2e095e
fix duplicating flute glitch ( #5436 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-03 13:01:18 +02:00
psf
9a24c031bb
Replaced copyright magic numbers in intro.c with constants ( #2035 )
2024-10-02 20:48:54 -04:00
GriffinR
2b73d10a2a
Merge pull request #2041 from Jaizu/patch-9
...
Ignore mGBA screenshots
2024-10-02 15:35:20 -04:00
GriffinR
44e9228a6e
Merge pull request #2038 from GriffinRichards/gflib-syms
...
Remove explicit symbol sizes in sym_common.txt
2024-10-02 15:34:42 -04:00
GriffinR
37d104f7a5
Merge pull request #2039 from Scyrous/patch-1
...
Bugfix for cable car hikerGraphicsIds array
2024-10-02 15:34:22 -04:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) ( #5455 )
2024-10-02 21:20:02 +02:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible ( #5449 )
...
* Fixes recoil moves not triggering berries if possible
* Update battle_script_commands.h
2024-10-01 10:43:58 +02:00
Jaizu
c8cc0fa5a3
Ignore mGBA screenshots
...
Everytime I make a new project I suffer, please merge.
2024-10-01 10:07:45 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests ( #5444 )
2024-09-29 17:05:54 -04:00
Eduardo Quezada
4183fa9d50
Fixed test assumption fail summary fields using more memory than needed ( #5443 )
2024-09-29 14:40:37 -03:00
Pawkkie
5908fbef9c
Wake-Up Slap test typo ( #5442 )
...
* Wake-Up Slap test typo
* Update test/battle/move_effect/wake_up_slap.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-09-29 12:34:34 -04:00
Scyrous
1dc85df1f0
Update cable_car.c
2024-09-29 14:38:08 +02:00
Scyrous
8e2c3ca3f2
Bugfix for cable car sprite array count
2024-09-29 14:13:50 +02:00
GriffinR
80a37c16be
Remove explicit symbol sizes in sym_common.txt
2024-09-25 16:14:10 -04:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive ( #5430 )
...
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)
* Add Snatch interactions with Dancer, Swallow
* Trace fix + cleanup
* Simplify Quash
* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests
* Fix Booster Energy Ability Popup
* Accidentally removed healing from Swallow
* More Trace cleanup
2024-09-24 18:40:44 +02:00
psf
55086586c5
Revert 5422 ( #5424 )
2024-09-22 16:59:43 -07:00
ghoulslash
acd07ccfc1
add rocky helmet dmg to tangling hair + defiant test to ensure original battler IDs from chaining effects ( #5423 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 19:44:18 +02:00
Bassoonian
918d45a623
Fix default tera type changing upon evolution/form change ( #5422 )
2024-09-22 16:33:17 +02:00
ghoulslash
ed005fc345
Fix affection check for exp multiplier ( #5421 )
2024-09-22 08:47:37 -04:00
Bassoonian
d122c0a222
Fix affection check for exp multiplier
2024-09-22 14:14:15 +02:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative ( #5418 )
...
* settotemboost use callnative
* Update src/battle_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-22 11:25:42 +02:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother ( #4816 )
...
* Smoother primal/mega animation
* Just to make the CI run. It needs to run
* Update src/battle_anim_effects_3.c
---------
Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-21 23:47:19 +02:00
Bassoonian
832a7b286d
Update item_use.c ( #5415 )
2024-09-21 21:22:30 +02:00
kittenchilly
39a8a77d3d
Play point animation when sending a follower into battle ( #5406 )
...
* Add point animation when sending a follower into battle
* Update trainers.h
2024-09-21 20:28:20 +02:00
kittenchilly
f7d2e62ccc
Fix Switcheroo giving score even if the opponent has no held item ( #5412 )
2024-09-21 18:51:08 +02:00
GriffinR
473e0623ba
Merge pull request #2031 from GriffinRichards/fix-toolchain
...
Minor toolchain fixes
2024-09-19 12:23:58 -04:00
GriffinR
8f41d9eb17
Merge branch 'master' into fix-toolchain
2024-09-19 12:20:51 -04:00
GriffinR
635325304b
Merge pull request #2033 from Kurausukun/goodbye_gflib
...
Remove gflib
2024-09-19 12:19:48 -04:00
Alex
68c51f8412
Fixes Spiky Shield Counter interaction ( #5402 )
...
* Fixes Spiky Shield Counter interaction
* Update test/battle/move_effect/protect.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-19 12:00:32 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests ( #5400 )
...
* Fix Quash + After You and Quash configs
* Add tests
2024-09-19 00:10:29 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change ( #5398 )
...
* changes Growth's move description to account for Gen 5+ behavior
* completes B_DIVE_BALL_MODIFIER comment
* fixes typos and incongruent spacing in various files
* Update src/data/moves_info.h
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-18 23:03:36 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot ( #5397 )
2024-09-18 16:58:49 +02:00
RavePossum
27db57f854
fallback on default BW popup theme to reduce potential for error ( #5392 )
2024-09-18 16:57:13 +02:00
Kurausukun
9cb353179b
fix indentation
2024-09-18 10:42:28 -04:00
Kurausukun
52c2728ff6
remove gflib
2024-09-18 10:37:34 -04:00
Alex
95dac7c4ac
Remove potential uninitialized behavior ( #5393 )
...
`MAX_BATTLERS_COUNT` makes more sense to use here because we iterate over max battlers in the first place.
2024-09-17 20:58:43 +02:00
Eduardo Quezada
6116b8b04e
Start 1.9.3 cycle
2024-09-16 11:57:41 -03:00
