hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
hedara90
|
e92d48aee9
|
03/05/25 Master to upcoming merge (#6764)
|
2025-05-03 10:54:27 +02:00 |
|
Pawkkie
|
5e2a066eda
|
Add AI_FLAG_PP_STALL_PREVENTION to ai_flags.md (#6756)
|
2025-05-03 10:48:30 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
hedara90
|
68d9c0e456
|
Fix the Move Item option in the PC still expecting compressed palettes (#6739)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 21:43:24 +02:00 |
|
Bivurnum
|
668cd7e413
|
Rename follower npc macros for better specificity and to match documentation (#6742)
|
2025-05-02 21:08:42 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
Pawkkie
|
1f5d949013
|
Pret merge (2nd of May 2025) (#6752)
|
2025-05-02 12:14:39 -04:00 |
|
GriffinR
|
263026e432
|
Merge pull request #2128 from DavidJCobb/re-battle-weather-anims
Identified task and sprite fields related to battle weather animations
|
2025-05-02 11:33:04 -04:00 |
|
hedara90
|
ccda2308a3
|
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 11:30:09 -04:00 |
|
Hedara
|
4fa48b6e89
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02
|
2025-05-02 17:29:41 +02:00 |
|
GriffinR
|
5a036aedcf
|
Merge pull request #2131 from hedara90/fix-mapson-g++-include
Added missing include due to g++ changes
|
2025-05-02 11:28:12 -04:00 |
|
Hedara
|
c8d3a6b4df
|
Added missing include due to g++ changes
|
2025-05-02 16:03:55 +02:00 |
|
DavidJCobb
|
0f17e70371
|
Shorter names for engine/controller communication enum members
|
2025-05-02 00:01:15 -04:00 |
|
DavidJCobb
|
d83b0671f7
|
Battle anims, ice: ARRAY_COUNT works if used with a cast
|
2025-05-01 23:49:05 -04:00 |
|
AlexOn1ine
|
9a14bb2dd3
|
removed aiFlags prefix
|
2025-05-01 20:22:11 +02:00 |
|
AlexOn1ine
|
057c0f5480
|
fix test compiling
|
2025-05-01 17:25:27 +02:00 |
|
AlexOn1ine
|
182d42642d
|
Move out ai struct out of BattleResources
|
2025-05-01 11:27:48 +02:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Pawkkie
|
1a2cd5645a
|
Fix roll handling in AI party damage calcs (#6733)
|
2025-05-01 10:15:19 +02:00 |
|
Pawkkie
|
4b1789ab1e
|
Fix Wonder Guard potential double switching (#6737)
|
2025-04-30 18:16:48 -04:00 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04:00 |
|
Alex
|
55f9f6adea
|
Refactor battler flee and watch options + clean up (#6724)
|
2025-04-30 11:54:42 -04:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -04:00 |
|
Bassoonian
|
2412666b01
|
Master to upcoming 2025-04-30 (#6731)
|
2025-04-30 15:56:07 +02:00 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +02:00 |
|
hedara90
|
66a5ad5258
|
Updated label workflow (#6729)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-30 14:01:45 +02:00 |
|
Cafe
|
b451bc3606
|
New Lurantis animation (#6725)
|
2025-04-30 12:45:29 +02:00 |
|
hedara90
|
8fc62f293d
|
Release 1.11.2 (#6728)
|
2025-04-30 12:01:58 +02:00 |
|
Hedara
|
f0ecbce9c7
|
Start of 1.11.3 Cycle
|
2025-04-30 11:26:09 +02:00 |
|
Hedara
|
accb85554a
|
Expansion 1.11.2 Release
|
2025-04-30 11:23:05 +02:00 |
|
Alex
|
afcba8d9cd
|
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719)
|
2025-04-29 23:25:56 +02:00 |
|
Bassoonian
|
c8e978c3d5
|
Pret merge 2025-04-29 (#6722)
|
2025-04-29 23:24:12 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
Pawkkie
|
ab6a97d20d
|
remove predictedScore
|
2025-04-28 21:47:17 -04:00 |
|
hedara90
|
4b4a679b96
|
Fixed objects not getting unloaded properly when event flags are set (#6715)
|
2025-04-28 21:06:31 +02:00 |
|
Pawkkie
|
787a8a0d9d
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 13:23:33 -04:00 |
|
Eduardo Quezada
|
9c6fa49671
|
Use correct define for moves in test runner (#6711)
|
2025-04-28 12:09:47 -04:00 |
|
Bivurnum
|
49ae82c679
|
changed remove check from objId to localId for npc followers
|
2025-04-28 10:58:35 -05:00 |
|
Catnip-Consumer
|
2cc013ff3e
|
Apply fixes to preproc for Windows compatibility
|
2025-04-28 14:36:19 +03:00 |
|
DavidJCobb
|
35b33a46e9
|
Identified task and sprite fields related to battle weather animations
Named task and sprite fields related to the animations for Hail, Rain Dance, and Sandstorm.
|
2025-04-28 05:39:52 -04:00 |
|
Pawkkie
|
96a8035dec
|
Fix party data assignment (#6712)
|
2025-04-28 08:48:21 +02:00 |
|
Pawkkie
|
7a3cf5d3a3
|
Improve AI's defense against Focus Punch (#6713)
|
2025-04-28 08:34:09 +02:00 |
|
Pawkkie
|
38c90909eb
|
WORKS, still needs work :D
|
2025-04-28 00:56:03 -04:00 |
|
Pawkkie
|
4970b3bd95
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 00:33:42 -04:00 |
|
Eduardo Quezada
|
c1b9ed5dcf
|
Fixed upcoming not compiling in gcc 11.4.0 (#6710)
|
2025-04-27 23:11:03 -04:00 |
|
Eduardo Quezada
|
56bd65eb9d
|
Fix other missing instances of MAX_LINK_PLAYERS
|
2025-04-27 22:28:26 -04:00 |
|
hedara90
|
67f3405864
|
Fix pc mon pic (#6709)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-27 15:19:46 -04:00 |
|
hedara90
|
5dfbdf56da
|
27/04/25 Master to upcoming merge (#6701)
|
2025-04-27 18:01:50 +02:00 |
|
Eduardo Quezada
|
fc872b481e
|
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon (#6702)
|
2025-04-27 15:27:21 +02:00 |
|