Commit Graph

4792 Commits

Author SHA1 Message Date
Alex
0843a70986
Fix SafeguardProtected script (#9559) 2026-03-18 11:39:19 +01:00
FosterProgramming
77fa8e086b
Version specific tweaks of post whiteout script (#9521)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2026-03-16 13:17:35 +01:00
Linathan
57a3f18ae4
Fixes abilities that grant type immunities not outputting battle messages (#9470)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-03-08 08:18:20 +01:00
Alex
78e4de61f8
Fix weatherform change when primal weather leaves the field (#9424)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-03-06 15:12:08 +00:00
Alex
c8ce8a2b28
Fixes U-turn not reseting targetsDone flag (#9411)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-03-04 13:16:56 +01:00
Bassoonian
885180ff8b
27/02/26 Master to upcoming merge (#9384)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-28 15:58:05 +01:00
AlexOn1ine
0fc3ef056a 27/02/26 Master to upcoming merge 2026-02-27 23:53:24 +01:00
Bassoonian
310f746565
Fix space indentation in .s and .inc files (#9371)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-27 12:45:00 -08:00
Alex
893563a2d5
Pret merge, 26th of February (#9362)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com>
Co-authored-by: Kildemal <206095739+izrofid@users.noreply.github.com>
Co-authored-by: Marky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-26 20:25:28 +01:00
Hedara
4dba49657a Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_anim_scripts.s
	src/battle_anim_water.c
	src/event_object_movement.c
	src/field_player_avatar.c
2026-02-26 15:33:26 +01:00
FosterProgramming
e5b2492b8d
createmon uses enum Pokeball instead of Item (#9281)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-02-25 21:10:57 +01:00
Linathan
a635ac599d
Zen Mode Fix: Removes start battle form change and adds switch-out form change (#9304)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-02-25 19:35:16 +01:00
FosterProgramming
6ac7540d3b
Fix special vars in frlg ingame trade (#9328) 2026-02-25 18:51:15 +01:00
FosterProgramming
18acbf853d
Redraw money box after multi choice in bike shop script (#9331) 2026-02-25 17:27:38 +01:00
FosterProgramming
91a1278934
Fix region text when looking at map in frlg (#9347) 2026-02-25 15:19:09 +01:00
FosterProgramming
d56112cd78
Fix frlg coinbox window (#9336)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-25 08:17:46 +00:00
Linathan
609faea428
Fix Power Construct Z symbol color + Add Form Change Sounds (#9326)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-02-24 19:16:47 +01:00
PhallenTree
81a5622b51
Move undoing Dynamax to before faint cry (#9317) 2026-02-23 20:40:37 +01:00
PhallenTree
8e3183a7a9
Simplify defrosting/thawing and expand target thawing config (#9271) 2026-02-23 17:11:05 +01:00
AlexOn1ine
675de8cbea 21/02/26 Master to upcoming merge 2026-02-21 12:55:21 +01:00
GGbond
ccf71d2d6a
Fix Venom Drench bypassing Substitute (#9289) 2026-02-21 10:24:43 +01:00
GGbond
b7755887cc
Fix Tickle to be blocked by Substitute in Gen 4+ (#9288) 2026-02-21 10:23:49 +01:00
PhallenTree
199d7ae2cb
Fixes Rapid Spin and target defrost not being blocked by Sheer Force (#9252)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-19 14:24:39 +01:00
Kildemal
07fa2e2751
fix(bttl-anim): remove unused battle selector to silence warning (#9218) 2026-02-17 18:59:02 +01:00
Alex
89fbaef8ba
Sky Drop Fixes/Refactor (#9185)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-02-16 18:22:53 +01:00
PhallenTree
cf18d086b6
Adds CancelerSetTargets and improves Pre Attack Effects (#9178)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-02-14 20:54:01 +01:00
Alex
ce15e5486d
Fixes Gulp Missile crash on targets that can be statused (#9179)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
2026-02-10 20:13:27 +01:00
GGbond
20a986519d
Fix Aqua Ring reuse failure check and add Aqua Ring/Ingrain tests (#9174) 2026-02-10 10:00:42 +01:00
Frank DeBlasio
064ca5c243
Added macro for Surf/Muddy Water's animation (#2232) 2026-02-06 10:08:20 -05:00
Alex
63fc5bf0fe
Strength Sap fixes (#9130)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-06 15:11:23 +01:00
Eduardo Quezada
32d1777b7a
Use direct config names instead of enum names (#8824)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-02-06 11:57:33 +01:00
hedara90
83be28dc37
Fix migration script output from move anim documentation (#9140)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-06 11:53:41 +01:00
Hedara
7bbabdef43 Re-apply move animation migration 2026-02-04 12:51:09 +01:00
Frank DeBlasio
dafbe66df4
Converted break_screen_animation from a macro to a function (#9115)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-02-04 09:54:14 +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
Alex
829488e761
Merge branch 'upcoming' into master-merge-3 2026-01-30 12:55:34 +01:00
AlexOn1ine
396c64c22a 30/01/26 Master to upcoming merge 2026-01-30 12:49:21 +01:00
Eduardo Quezada
278739ee66
Form Change Improvements (#8850)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-29 00:35:08 +01:00
Bassoonian
b3b56b3767
Fix FRLG comment oversight in `script_cmd_table.inc` (#9043) 2026-01-28 13:37:48 -08:00
Frank DeBlasio
db3e5cc1fd
Consolidated common steps for Brick Break, Psychic Fang, and Raging Bull's animations (#9020) 2026-01-28 17:47:00 +01:00
cawtds
97e83ebe6a
Add FRLG (#7423) 2026-01-28 17:41:12 +01:00
Alex
0c44cc1b27
Move Target failure follow up (#8986)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2026-01-28 15:48:14 +01:00
Alex
c8eb55969e
Add accuracy check to BattleScript_EffectNightmare (#9032)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
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
AlexOn1ine
f8266b828b 26/01/26 Master to upcoming merge 2026-01-26 19:35:43 +01:00
GGbond
21492e0f23
Fix Foresight/Miracle Eye repeated-use behavior (#9025) 2026-01-26 14:48:39 +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
FosterProgramming
fe2c154b89
Refactor chooseboxmon (#8491)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-22 19:54:19 +01:00
Alex
6c05a08750
Refactor OHKO Moves (#8916) 2026-01-21 11:55:30 +01:00