hedara90
|
733512f677
|
Improve sBattleIntroSlideFuncs bounds check (#8084)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-10-30 17:14:40 +01:00 |
|
PhallenTree
|
9d06a4fb55
|
Emergency Exit on hazards activation + fix end of turn activation (#8075)
|
2025-10-30 17:01:13 +01:00 |
|
FosterProgramming
|
44dc720260
|
Fix namebox bug when reloading the map mid-script (#8073)
|
2025-10-30 09:13:22 +01: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 |
|
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 |
|
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 |
|
grintoul
|
3260d2a42a
|
Fixed test "Revival Blessing cannot revive a partner's party member" (#8031)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-10-26 11:43:54 +01:00 |
|
khbsd
|
7b3a2f3aaf
|
fix: hypertraining a stat now optionally reflects in the summary screen (#8035)
|
2025-10-25 19:15:03 -07:00 |
|
Bassoonian
|
776a2e762b
|
25/10/25 Master to upcoming merge (#8041)
|
2025-10-26 00:35:59 +02:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
grintoul
|
271ca56bdb
|
Fixes CanUseLastResort and resolves 3 KNOWN_FAILING Last Resort tests (#8032)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-25 14:42:28 +02:00 |
|
Bassoonian
|
9fa6cd6a4c
|
Add test to detect save file shifting (#8030)
|
2025-10-25 14:38:58 +02:00 |
|
Bassoonian
|
be23dfdf2a
|
Even more enums and documentation (#8029)
|
2025-10-25 14:37:47 +02:00 |
|
hedara90
|
6eaa09bf5d
|
Add error messages for trying to send an illegal mon to the PC and fixes index in double wild battles (#7982)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-10-25 14:37:17 +02:00 |
|
Alex
|
7ebb939cbc
|
Remove usage of gBattlerTarget for MirrorHerb/Opportunist (#8033)
|
2025-10-25 13:52:40 +02:00 |
|
Alex
|
65244cbeb4
|
Moved usedHeldItem to Party State struct (#8006)
|
2025-10-24 18:56:16 +02:00 |
|
FosterProgramming
|
b4041535cf
|
Fix battle dome bug (again) (#8007)
|
2025-10-24 18:55:32 +02:00 |
|
Alex
|
eb1be34d47
|
Fix Salt Cure script (#8005)
|
2025-10-24 18:53:53 +02:00 |
|
Alex
|
8ea947d5a1
|
Fixes Protosynthesis not activating after weather was reset (#8021)
|
2025-10-24 18:53:34 +02:00 |
|
Alex
|
cec0351dd5
|
I don't know (#8015)
|
2025-10-24 18:50:59 +02:00 |
|
Alex
|
8e76889579
|
Fixes visual glitch after Misty Explosion (#8022)
|
2025-10-24 18:50:41 +02:00 |
|
Alex
|
083add8127
|
Adds missing alive check for Rapid Spin (#8024)
|
2025-10-24 18:50:23 +02:00 |
|
grintoul
|
95c2a6e2b6
|
Multibattle testing system (#7257)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-10-24 15:00:23 +02:00 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
|
2025-10-24 11:50:19 +02:00 |
|
FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
|
2025-10-23 21:29:33 +02:00 |
|
Bassoonian
|
fbd702e3a4
|
Some more documentation and cleanup (#8020)
|
2025-10-23 20:14:38 +02:00 |
|
FosterProgramming
|
5b4403ddfe
|
Fix stats defined in tests being overwritteng by stat change (#8018)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-23 18:59:15 +02:00 |
|
Bassoonian
|
fb660061ab
|
Converts some defines to enums and name unnamed enums (#8019)
|
2025-10-23 18:06:29 +02:00 |
|
FosterProgramming
|
46b122c5ce
|
Revert HGSS dex and movelist changes (#8016)
|
2025-10-23 13:52:25 +02:00 |
|
Nopinou
|
f53861ae05
|
Remove appearedInBattle bitfield & redundant use of sentOut partyState (#8011)
|
2025-10-22 23:25:18 +02:00 |
|
FosterProgramming
|
1343ddf7c3
|
Fix badge boost not applying in gen1 and 2 (#8013)
|
2025-10-22 22:57:04 +02:00 |
|