psf
|
591c8cc69c
|
Updated CONTRIBUTING.md and Merge Freeze definition (#6952)
|
2025-05-22 09:29:13 +02:00 |
|
Eduardo Quezada
|
d42d9012e4
|
Documented usage of createsprite gDirtPlumeSpriteTemplate (#6954)
|
2025-05-22 09:27:30 +02:00 |
|
Eduardo Quezada
|
b85a56b718
|
Documented usage of createsprite gSimplePaletteBlendSpriteTemplate (#6956)
|
2025-05-22 09:21:43 +02:00 |
|
Alex
|
95036e3b9f
|
Fixes global usage in super fang effect. (#6941)
|
2025-05-21 20:33:52 +02:00 |
|
surskitty
|
63d1a9b3d9
|
Commenting in config files to explain limits of map popups and wild AI flags (#6923)
|
2025-05-21 16:15:35 +02:00 |
|
PhallenTree
|
a639460c27
|
Fixes Ice Body healing HP regardless of weather (#6939)
|
2025-05-21 14:25:12 +02:00 |
|
Eduardo Quezada
|
87fbf22476
|
Fix Rage Fist evolution method (#6937)
|
2025-05-21 10:41:51 +02:00 |
|
khbsd
|
ddc662fd32
|
fix: avoid unexpected data shifting by removing preproc'd array size (#6916)
|
2025-05-20 17:09:04 +02:00 |
|
grintoul1
|
0d8d36499b
|
Mugshot Transitions 2v1 fix (#6911)
|
2025-05-19 07:44:05 +02:00 |
|
Eduardo Quezada
|
29a6113318
|
Debug menu cleanup (#6881)
|
2025-05-17 16:55:05 +02:00 |
|
Alex
|
f1c1906324
|
Fix misleading name (#6865)
|
2025-05-17 16:23:30 +02:00 |
|
Eduardo Quezada
|
406fd7ce81
|
Expand trainerproc to support additional battle types (#6770)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-17 15:08:44 +02:00 |
|
Eduardo Quezada
|
4145404d22
|
Optimized PokemonUseItemEffects function (#6878)
|
2025-05-17 15:08:28 +02:00 |
|
Bassoonian
|
54806c8838
|
Add no-whiteout feature (#6795)
|
2025-05-17 11:20:35 +02:00 |
|
Eduardo Quezada
|
edf7c67775
|
Remove non-volatile status EFFECTs (#6772)
|
2025-05-16 22:52:51 +02:00 |
|
Jonathan Lin
|
c133da2437
|
Fix to warnings pertaining to Mega Evolution and Ultra Burst RGB values (#6883)
|
2025-05-16 21:26:28 +02:00 |
|
Alex
|
73e65b76c4
|
Consolidated HasMoveFlagX functions (#6874)
|
2025-05-16 20:50:45 +02:00 |
|
surskitty
|
e44d0326be
|
AI double battle friendly fire logic improvements (#6766)
|
2025-05-16 11:41:03 -04:00 |
|
Bassoonian
|
d1307371db
|
Master to upcoming merge (#6879)
|
2025-05-16 17:25:15 +02:00 |
|
jfb1337
|
d57dcd2e35
|
Reword move and ability descriptions to improve clarity (#6861)
Co-authored-by: jfb1337 <>
|
2025-05-16 17:23:56 +02:00 |
|
PhallenTree
|
1a707e8735
|
Fixes Magic Guard causing Wrap to end immediately (#6876)
|
2025-05-16 15:29:48 +02:00 |
|
AlexOn1ine
|
33607529cd
|
conflicts
|
2025-05-16 10:46:32 +02:00 |
|
innocenthedgehog
|
49584e134b
|
Switch AI considers Bulletproof ability (#6872)
|
2025-05-16 10:35:34 +02:00 |
|
Bivurnum
|
ddff74e8f9
|
Bug fix: add proper elevation handling for npc followers (#6871)
|
2025-05-16 09:54:22 +02:00 |
|
hedara90
|
4d4dea1b38
|
Master to upcoming merge (#6868)
|
2025-05-16 09:37:39 +02:00 |
|
kittenchilly
|
7359d234c8
|
PokeCommunity sprites batch (April 2025) (#6840)
|
2025-05-16 09:35:30 +02:00 |
|
spindrift64
|
38cd80760b
|
Gen 1 no recharge on KO (#6869)
|
2025-05-16 08:09:18 +02:00 |
|
Alex
|
fb1737ddbf
|
Pret merge (15th of May, 2025) (#6870)
|
2025-05-16 08:00:07 +02:00 |
|
Eduardo Quezada
|
3056909286
|
Added weather accuracy move flags (#6857)
|
2025-05-16 07:58:40 +02:00 |
|
Hedara
|
6896750921
|
Merge commit '0aae36984f2561f075b2b7e7d2a0924a912f6af7' into pret-merge
|
2025-05-15 21:48:17 +02:00 |
|
Hedara
|
468454d810
|
Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge
Conflicts:
src/battle_controllers.c
src/battle_gfx_sfx_util.c
|
2025-05-15 21:38:57 +02:00 |
|
Hedara
|
578c5f96cd
|
Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
Conflicts:
include/battle_gfx_sfx_util.h
src/apprentice.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_dome.c
src/battle_gfx_sfx_util.c
src/battle_script_commands.c
src/battle_tv.c
src/item_menu.c
src/move_relearner.c
src/pokemon.c
src/scrcmd.c
|
2025-05-15 21:31:54 +02:00 |
|
Hedara
|
2945c83bbc
|
Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
Conflicts:
include/battle.h
include/battle_ai_script_commands.h
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/pokemon.h
include/recorded_battle.h
src/battle_ai_script_commands.c
src/battle_anim.c
src/battle_anim_mons.c
src/battle_anim_sound_tasks.c
src/battle_anim_status_effects.c
src/battle_controller_link_opponent.c
src/battle_controller_link_partner.c
src/battle_controller_opponent.c
src/battle_controller_player.c
src/battle_controller_player_partner.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_controller_wally.c
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_interface.c
src/battle_main.c
src/battle_message.c
src/battle_records.c
src/battle_script_commands.c
src/battle_tv.c
src/battle_util.c
src/battle_util2.c
src/pokeball.c
src/pokemon.c
src/recorded_battle.c
src/reshow_battle_screen.c
|
2025-05-15 21:15:37 +02:00 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
Pawkkie
|
0ea1ebe8de
|
Fix AI_FLAG_PREDICT_MOVES scoring bug (#6867)
|
2025-05-15 13:53:51 -04:00 |
|
Pawkkie
|
39022f3e6a
|
Fix FindMonThatAbsorbsOpponentsMove not seeing Mold Breaker or choice items (#6864)
|
2025-05-15 19:42:06 +02:00 |
|
Pawkkie
|
0cfcc7fb87
|
Add prediction function (#6858)
|
2025-05-15 11:55:26 -04:00 |
|
Hedara
|
a001e36f1c
|
Merge commit '384b8f127e6a18aef0a3' into pret-merge
Conflicts:
src/battle_anim_mons.c
|
2025-05-15 17:36:48 +02:00 |
|
Hedara
|
49906a81f7
|
Merge commit 'c39ef1a03002a7af94' into pret-merge
Conflicts:
src/battle_ai_switch_items.c
src/battle_controller_link_opponent.c
src/battle_controller_link_partner.c
src/battle_controller_opponent.c
src/battle_controller_player.c
src/battle_controller_player_partner.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_controller_safari.c
src/battle_controller_wally.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/battle_util2.c
src/pokemon.c
|
2025-05-15 17:31:50 +02:00 |
|
Hedara
|
659473760c
|
Merge commit '263026e4320c' into pret-merge
Conflicts:
src/battle_anim_rock.c
src/battle_anim_water.c
|
2025-05-15 16:21:33 +02:00 |
|
Alex
|
44d9b9c9e6
|
Further moveend changes (move blocks) (#6820)
|
2025-05-15 12:43:50 +02:00 |
|
Bassoonian
|
e42890e954
|
Consolidates a bunch of battle controller functions (#6838)
|
2025-05-15 11:26:18 +02:00 |
|
Alex
|
a086d5f592
|
Reverts wrongly done gem fix and renames struggle effect (#6806)
|
2025-05-15 10:45:48 +02:00 |
|
Alex
|
75cd16dae0
|
Fix potential bug in BattleScript_FriskActivates (#6850)
|
2025-05-15 10:44:37 +02:00 |
|
kittenchilly
|
4474bd5b80
|
Add move description data for Z-Moves and Max/G-Max moves (#6852)
|
2025-05-15 10:44:09 +02:00 |
|
hedara90
|
9924ae3391
|
Make make clean work again (#6848)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-15 10:40:35 +02:00 |
|
Alex
|
34918f5f0d
|
Fixes wrongly usage of arguments without checking effect (#6859)
|
2025-05-15 10:39:31 +02:00 |
|
mudskipper13
|
ad0e98bb12
|
Prevent scaninc touching tests when make-ing non-test builds (#6812)
|
2025-05-15 10:15:22 +02:00 |
|
Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +02:00 |
|
AlexOn1ine
|
243c43e6a4
|
Add prediction function
|
2025-05-15 08:10:19 +02:00 |
|