18825 Commits

Author SHA1 Message Date
Eduardo Quezada
51a6081c8e
Parametrized Ice Face's weather form change (#8115) 2025-11-02 20:31:09 +01:00
Alex
d95c6427b0
Fixes Sticky Barb never getting transferred to attacker + tests (#8108) 2025-11-02 11:31:38 +01:00
PhallenTree
f206746bfa
Fix test 2025-11-01 19:33:51 +00:00
PhallenTree
c9c0b79dcb
Assumes for the other moves 2025-11-01 19:02:27 +00:00
PhallenTree
e62be0b3a9
Fixes Sticky Barb never getting transferred to attacker + tests 2025-11-01 19:01:18 +00:00
FosterProgramming
4d60c9e83f
Fix copyvar instead of setvar causing issue with LTO (#8097) 2025-11-01 16:42:07 +00:00
psf
05191e7f85
01/11/25 Master to ucpoming merge (#8100) 2025-11-01 05:20:38 -07:00
AlexOn1ine
d4e7e7ad36 10/11/25 Master to upcoming merge 2025-11-01 11:54:17 +01:00
Eduardo Quezada
577257051a
Fix compile issue in gcc 11 (#8095) 2025-10-31 21:33:46 +01:00
Eduardo Quezada
f66ba68eee
Fixed Zygarde Complete disappearing upon catch (#8089) 2025-10-31 19:41:46 +01:00
FosterProgramming
6c3f87e74e
Fix bug when a captured pokemon replaces a party member who changed forms (#8091) 2025-10-31 17:50:29 +01:00
FosterProgramming
79441c6574
Fix bug where mon selection doesn't properly account for party order (#8088) 2025-10-31 17:44:08 +01:00
Alex
1c1a98ee45
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-30 23:14:02 +01:00
Alex
ff557e3d0c
Clean up for item hold effect refactor (#8014) 2025-10-30 21:07:37 +01:00
FosterProgramming
0b005d4b6f
Fix non-battle trainer script not running properly (#8056) 2025-10-30 19:47:22 +01:00
Alex
3a3b947622
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-30 17:51:57 +01:00
Estellar
fd84adc421
Minor clean up in menu.c (#8060) 2025-10-30 17:15:15 +01:00
hedara90
733512f677
Improve sBattleIntroSlideFuncs bounds check (#8084)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-30 17:14:40 +01:00
Eduardo Quezada
8de86ba243
Fixed Belly Drum/Contrary interaction at max Attack (#8078) 2025-10-30 17:14:07 +01:00
PhallenTree
9d06a4fb55
Emergency Exit on hazards activation + fix end of turn activation (#8075) 2025-10-30 17:01:13 +01:00
Alex
c77c624e9f
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083) 2025-10-30 16:14:03 +01:00
Eduardo Quezada
814cf53629
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080) 2025-10-30 15:43:50 +01:00
FosterProgramming
44dc720260
Fix namebox bug when reloading the map mid-script (#8073) 2025-10-30 09:13:22 +01:00
Alex
31e663ceda
Fixed fainting form change tests (#8079) 2025-10-30 08:57:59 +01:00
Eduardo Quezada
9fa857d34c Removed redundant comment 2025-10-29 21:08:05 -03:00
Eduardo Quezada
9bfac0099e Fixed fainting form change tests 2025-10-29 18:13:41 -03:00
Alex
9717c53afa
Master to upcoming, 2025-10-29 (#8077)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: grintoul <166724814+grintoul1@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-29 19:10:24 +01:00
Alex
ea3b72f43f
Initialize DamageContext on declaration to zero (#8076) 2025-10-29 19:04:56 +01:00
Hedara
a2ef3284dd Merge branch 'master' into master-to-upcoming
Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-10-29 18:42:59 +01:00
FosterProgramming
712e087754
Fix move description prompt window not appear when choosing a move after canceling target selection (#8055) 2025-10-29 17:53:41 +01:00
Alex
dd875b87bc
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-29 15:20:12 +01:00
Alex
ea60c32fbe
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-29 15:19:50 +01:00
PhallenTree
4a714225e5
Fixes hazards and switch-in items not being reset when switching in (#8074) 2025-10-29 14:25:05 +01:00
grintoul
c90e6952f3
Fix Ally Switch being useable in Frontier Link Multi battles (#8059)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-28 19:26:10 +01:00
grintoul
5873621154
Corrects battler position checks in battle_message.c (#8070) 2025-10-28 19:24:13 +01:00
grintoul
a9fc0b28c9
Corrects battler partner identification in battle_ai_switch_items.c (#8071) 2025-10-28 19:23:41 +01:00
FosterProgramming
fd07daf0d8
Fix nature power string and add support for evnvironment in tests (#8068)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-28 19:23:16 +01:00
allcontributors[bot]
96f6e99486
add MandL27 as a contributor for code (#8064)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-10-28 17:22:41 +01:00
FosterProgramming
3b66cd007b
Fix target cancelling not working properly with z-move (#8067) 2025-10-28 17:19:52 +01:00
FosterProgramming
b82a5a4c1c
Fix wrong gimmick spite showing when inputting too fast (#8066) 2025-10-28 17:02:35 +01:00
Bassoonian
f7cbe4853b
Add type enum (#8054) 2025-10-27 16:41:22 +00:00
Bivurnum
6ddabde582
New Feature: ORAS Dowsing (#7211) 2025-10-27 17:41:07 +01:00
grintoul
a32da780c4
Corrects ONE_VS_TWO_BATTLE_TEST to use BATTLE_TEST_ARGS_ONE_VS_TWO (#8061) 2025-10-27 15:24:33 +00:00
PhallenTree
782c559a20
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042) 2025-10-26 22:41:16 +01:00
FosterProgramming
6faf35dde9
Fix emergency exit not triggering properly during wild battles (#8037) 2025-10-26 22:35:27 +01:00
Alex
e8ad3c20f7
Fixes compilation error due to #8002 (#8050) 2025-10-26 15:48:59 +01:00
FosterProgramming
a9486a5521
Fix battle arena counting all judges loss for the opponent (#8046) 2025-10-26 15:28:40 +01:00
Alex
4ed1c3309d
Decouple (overworld) statuses from ability function (#8002) 2025-10-26 13:57:34 +00:00
FosterProgramming
292d9b2933
Fix PC turning on/off animation not working in Battle Frontier (#8048) 2025-10-26 13:40:55 +00:00
Raymond Dodge
95d98305dd
Add camera-facing right-walking Krabby and Kingler follower sprites (#7881) 2025-10-26 11:45:40 +01:00