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
Eduardo Quezada
889a02d263
Version 1.9.2 ( #5357 )
...
* Version 1.9.2
* Apply suggestions from code review
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
* Updated to latest master
* Updated to latest master
* Fix last PR
* Corrected order + Pumpkaboo/Gourgeist credits
---------
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-09-16 12:12:34 -03:00
hedara90
3433567188
Gourgeist and Pumpkaboo follower sizes ( #5390 )
...
* Gourgeist sizes
* Gourgeist all sizes
* Pumpkaboo small
* Added all sizes of Pumpkaboo
* Resized Gourgeist (no more Titan)
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-15 15:28:04 -03:00
Bassoonian
0b429a8649
Merrp merge (September 9th) ( #5359 )
2024-09-15 13:21:39 +02:00
Eduardo Quezada
f720916633
CI fix attempt
2024-09-15 02:25:12 -03:00
Alex
0d7c193e4c
fixes Micle Berry not increasing accuracy on the next turn ( #5358 )
...
* fixes Micle Berry not increasing accuracy on the next turn
* adds bitfield instead of using protect struct
* test from pawkkie
* ndebug
* renaming
* delete redundant comment
* typo
* micle berry more detailed descriptions
2024-09-14 19:55:03 -04:00
Liamjd14
9d483cee5d
Enable asym for followers issue #5382 ( #5385 )
...
* Applies asym code to followers
galarian slowbro
tinkaton line
scovillain
2024-09-14 20:21:34 +02:00
GriffinR
62c27faba4
Merge pull request #2032 from DizzyEggg/patch-1
...
remove ScriptContext_Enable from secret_base.h
2024-09-14 13:17:26 -04:00
DizzyEggg
c4b5818d98
remove ScriptContext_Enable from secret_base.h
2024-09-14 19:13:02 +02:00
GriffinR
db898f8baa
Merge pull request #2030 from skyeforeverblue/patch-2
...
Update pull_request_template.md to include Discord username update
2024-09-14 10:56:50 -04:00
GriffinR
bc58a4ac04
Merge pull request #2029 from skyeforeverblue/patch-1
...
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
2024-09-14 10:56:41 -04:00
Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup ( #5383 )
2024-09-14 10:45:26 +02:00
GriffinR
302193a814
Have scaninc ignore non-existing files
2024-09-14 00:28:57 -04:00
GriffinR
b8c71fa84d
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
2024-09-13 23:38:50 -04:00
Eduardo Quezada
5954d662a5
Rebuild of makefile 7: Test Runner
2024-09-13 15:26:42 -03:00
Eduardo Quezada
bee1452c8e
Rebuild of makefile 6: File-specific stuff
2024-09-13 14:38:43 -03:00
Eduardo Quezada
5ea1f39a9d
Rebuild of makefile 5: trainerproc
2024-09-13 14:27:40 -03:00
PhallenTree
c7e1e857f3
Fix After You/Shell Trap not updating battlers' actions correctly ( #5384 )
2024-09-13 18:17:59 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests ( #5370 )
...
* Simplified fix from #4638
* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge
* Powder Tests
* Remove duplicate
* Assume Powder is a powder move
* Add config for Powder Rain interaction
* Only primal rain
* Z-Moves fix handled in Canceller_Z_Moves
* Fix BattleScript name
* Make sure Z-Move + Powder still damages user
2024-09-13 18:08:23 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Eduardo Quezada
8c0580828f
Apply suggestions from code review
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-13 09:27:16 -03:00
Alex
3d8b73300a
Fixes Multi Hit moves removing destiny bond flag in the middle of attack ( #5377 )
2024-09-12 17:46:59 -04:00
GriffinR
7007439be8
Remove old ld_script processing
2024-09-12 13:50:47 -04:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
GriffinR
d9b824db3f
Sync missing alignment from pokefirered
2024-09-12 12:27:31 -04:00
GriffinR
9e22bf1af4
Merge pull request #1957 from Icedude907/build-music-config
...
[Build System Rewrite] Improved audio rules
2024-09-12 10:46:30 -04:00
GriffinR
51131e2582
Merge pull request #1954 from Icedude907/build-scaninc-speed
...
[Build System Rewrite] Massive build speed improvement via scaninc changes
2024-09-12 10:45:41 -04:00
Eduardo Quezada
5790200e2d
Rebuild of makefile 4: Teachable learnset helper
2024-09-11 20:05:18 -03:00
Eduardo Quezada
5f8c915826
Rebuild of makefile 3: ANALYZE
2024-09-11 19:40:52 -03:00
Eduardo Quezada
83872ab89f
Rebuild of makefile 2: -Wall and UNUSED_ERROR
2024-09-11 19:31:40 -03:00
Eduardo Quezada
20e937a724
Rebuild of makefile 1: Modern as default
2024-09-11 16:33:11 -03:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase ( #5369 )
2024-09-11 11:18:58 +02:00
Skye Chappelle
a75be4124d
Update pull_request_template.md to include Discord username update
2024-09-10 23:39:41 -04:00
Skye Chappelle
28786b42a6
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
2024-09-10 23:36:13 -04:00
hedara90
c57d149003
Fixes with Pledge combos and absorption abilities ( #5364 )
...
* Fixes with Pledge combos and absorption moves
* Fixed incorrect merge
* Removed superflous if statement
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-10 23:53:55 +02:00
Pawkkie
3aa46c3ca0
Fix stat id check ( #5366 )
2024-09-10 23:52:49 +02:00
hedara90
36ff435ab6
Liam follower fixes ( #5334 )
...
* Fix Blinking on Meganium South Sprite
* Fixes Lediba and Ledian Blinking
* Fixes two blinking spots on spinerak
* Crobat Eye and Igglibuff butt vlinking fix
* More blinking follower fixes
flaaffy
xatu
hoppip line
* Blinking Gen 2 Fixes
Mantine
Miltank
Raikou
yanma
wooper
skarmory
* Gen 4 Fixes + donphan and espeon
prinplup
starraptor
shieldon
roserade
ambipom
mamoswine
Stunky
Donphan - gen 2 fix
Espion - noticed a flickering pixel on south walk
* Synchronization with Cafeei
* Messed up the merge, fixing now
* Added mantine
---------
Co-authored-by: Liamjd14 <Liamjdgaming@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 21:03:52 +02:00
Eduardo Quezada
60803cdba9
Fixed braces style
2024-09-09 13:58:23 -03:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00