Alex
90e4cc4906
Pret merge (31st of January 2026) ( #9099 )
...
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2026-01-31 22:49:53 +01:00
Hedara
e758d55a03
Merge remote-tracking branch 'pret/master' into pret-merge
...
Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor
Conflicts:
asm/macros/battle_anim_script.inc
data/battle_anim_scripts.s
include/constants/battle_anim.h
src/battle_anim_bug.c
src/battle_anim_dragon.c
src/battle_anim_effects_1.c
src/battle_anim_normal.c
2026-01-31 19:20:54 +01:00
PhallenTree
5d5f655b80
Fixes Infiltrator test battler not using intended move ( #9096 )
2026-01-31 18:36:56 +01:00
FosterProgramming
d6aac051fb
Fix debug menu using female icon with male palette ( #9092 )
2026-01-31 08:19:59 +00:00
ChrispyChris27
95d3258ef1
Fixes creation of certain overworld sprites in object_event_pic_tables_followers.h ( #9065 )
2026-01-30 16:42:51 -05:00
allcontributors[bot]
0cb34d3605
add ChrispyChris27 as a contributor for code ( #9067 )
...
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2026-01-30 16:23:37 -05:00
hedara90
e620a0a001
Add aif2pcm to gitignore ( #9077 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2026-01-30 22:19:51 +01:00
PhallenTree
022f5eb52e
Fixes Infiltrator and adds config for Substitute interaction ( #9073 )
2026-01-30 14:14:35 +01:00
Frank DeBlasio
ee1e02b2ef
Corrected Stone Axe and Ceaseless Edge descriptions ( #9062 )
2026-01-30 01:11:04 +00:00
GGbond
6928d54d46
Fix Pickpocket moveend target checks and Thief/Covet handoff ( #9037 )
2026-01-29 19:02:35 +01:00
GGbond
08dd7da30c
Fix AI wakeup-turn detection to consider Early Bird ( #9053 )
2026-01-29 18:33:36 +01:00
GGbond
4198a5cb85
Fix Forewarn edge cases and random selection ( #9049 )
2026-01-29 13:54:28 +01:00
PhallenTree
dd21d8fae4
Fixes Fling being usable with reusable TMs ( #8906 )
2026-01-28 15:50:45 +01:00
FosterProgramming
edaa838a20
Fix berry tree spawning with max yield when OW_BERRY_ALWAYS_WATERABLE is active ( #8976 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2026-01-28 15:50:06 +01:00
Alex
ec9ba22f87
Fixes to Commander and Emergency Exit ( #9040 )
2026-01-28 15:47:07 +01:00
Frank DeBlasio
b88554198e
Fixed instances of COMBO_STARTER_CHARGE used incorrectly ( #9034 )
2026-01-28 01:53:23 +00:00
Alex
c8eb55969e
Add accuracy check to BattleScript_EffectNightmare ( #9032 )
2026-01-27 16:17:25 +01:00
GGbond
aafc581460
Fix Psych Up wrong battler message and Gen 6+ crit ratio copying ( #9015 )
2026-01-27 15:44:42 +01:00
GGbond
e0fb60ba09
Fix Synchronoise typeless behavior in Gen7+ ( #9031 )
2026-01-27 15:39:59 +01:00
FosterProgramming
c468c9a5f7
Fix substitute follower appearing with dead party ( #9028 )
2026-01-27 14:17:26 +01:00
psf
433f55157c
fix: updated rulings about big feature label ( #9027 )
2026-01-26 13:19:55 -05:00
PhallenTree
cb697f5d7d
Fixes Beak Blast burning attacker when charging 2 turn move ( #9026 )
2026-01-26 18:16:01 +01:00
GGbond
b27eb839ed
Fix Crafty Shield consecutive-use failure ( #9023 )
2026-01-26 14:51:55 +01:00
GGbond
21492e0f23
Fix Foresight/Miracle Eye repeated-use behavior ( #9025 )
2026-01-26 14:48:39 +01:00
grintoul
30db62d4b7
Remove player party shiny bit setting in CreateFrontierBrainPokemon ( #9022 )
2026-01-26 00:17:12 +01:00
allcontributors[bot]
1cbbb304a9
add PacFire as a contributor for design ( #9017 )
...
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2026-01-25 18:48:04 +01:00
khbsd
12970602ce
fix: IsDoubleBattle() return value ( #9012 )
2026-01-25 10:15:01 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master ( #9011 )
2026-01-25 10:12:41 +01:00
GGbond
e871913e22
Fix Magnetic Flux target handling in singles ( #9007 )
2026-01-24 08:45:19 +01:00
PhallenTree
7722ebf470
Fixes Hyperspace Fury not breaking protection ( #8999 )
2026-01-23 22:28:22 +00:00
GGbond
5308124191
Align Crafty Shield with wiki and refine IsAllyProtectingFromMove ( #8990 )
2026-01-22 17:36:07 +01:00
allcontributors[bot]
670bd806e5
add SabataLunar as a contributor for design ( #8985 )
2026-01-21 15:50:13 +01:00
FosterProgramming
2eef017daf
Fix premier ball wrong data size ( #8979 )
2026-01-21 01:19:29 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot ( #8928 )
2026-01-20 22:06:50 +01:00
GGbond
c899479709
Fix the speed scoring of Tailwind for AI ( #8968 )
2026-01-20 22:04:09 +01:00
Bassoonian
d12929ffbd
Pret merge (20th of January, 2026) ( #8973 )
2026-01-20 14:35:55 +01:00
hedara90
3b241b561a
Move CMD_ARGS to battle_script_commands ( #8974 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2026-01-20 14:31:36 +01:00
FosterProgramming
298bf85759
Fix vivillon icy snow icon ( #8970 )
2026-01-20 13:05:28 +01:00
hedara90
f9c826ca57
Merge pull request #2228 from hedara90/fix-spaces
...
Fix spaces instead of tabs in battle_anim_scripts.s
2026-01-20 11:13:48 +00:00
Hedara
594a4c7ec3
Merge commit 'dc077e50d3a2d52964a52ce9a9e81fd99586dd4f' into pret-merge
...
Conflicts:
.github/workflows/build.yml
asm/macros/battle_script.inc
include/constants/battle_script_commands.h
src/battle_controllers.c
src/battle_script_commands.c
src/data/graphics/battle_environment.h
src/party_menu.c
2026-01-19 21:40:27 +01:00
Pawkkie
74f0e6286b
Amend "SS Item" category of scope doc ( #8966 )
2026-01-19 14:21:50 -05:00
Martin Griffin
f0b5abe290
Merge pull request #2070 from mrgriffin/battle-anim-cmd-args
...
Partially document battle animation scripts
2026-01-19 19:14:16 +00:00
GGbond
52d61546c9
Fix AI absorber switching for edge cases ( #8964 )
2026-01-19 13:14:56 -05:00
GriffinR
dc077e50d3
Merge pull request #2225 from fdeblasio/stadiumRenames
...
Renamed building and stadium palettes to be more accurate
2026-01-19 10:51:21 -05:00
Martin Griffin
22eed3f4bf
Partially document battle_anim_effects_1.c
2026-01-19 09:16:37 +00:00
Martin Griffin
0e415dde46
Document battle_anim_dragon.c
2026-01-19 09:16:37 +00:00
Martin Griffin
5d713ad9bb
Document battle_anim_dark.c
2026-01-19 09:16:37 +00:00
Martin Griffin
050a9415c7
Document battle_anim_bug.c
2026-01-19 09:16:37 +00:00
Martin Griffin
e09423fadf
Document battle_anim_normal.c
2026-01-19 09:16:37 +00:00
Frank
80db2c6aec
Renamed building and stadium palettes to be more accurate
2026-01-18 18:19:03 -05:00
