Alex
9259b7ee69
Bugfixes batch ( #6750 )
2025-05-02 20:14:27 +02: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
DavidJCobb
0f17e70371
Shorter names for engine/controller communication enum members
2025-05-02 00:01:15 -04:00
AlexOn1ine
9a14bb2dd3
removed aiFlags prefix
2025-05-01 20:22:11 +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
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
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
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
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
Pawkkie
787a8a0d9d
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
2025-04-28 13:23:33 -04:00
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch ( #6713 )
2025-04-28 08:34:09 +02:00
Pawkkie
4970b3bd95
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
2025-04-28 00:33:42 -04:00
hedara90
5dfbdf56da
27/04/25 Master to upcoming merge ( #6701 )
2025-04-27 18:01:50 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
AlexOn1ine
e246b20e72
27/04/25 Master to upcoming merge
2025-04-27 09:50:25 +02:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection ( #6697 )
2025-04-26 21:46:41 +02:00
DavidJCobb
7ee3043c58
Update battle_controllers.h
...
typo
2025-04-26 11:47:48 -04:00
DavidJCobb
2864408060
Tweaks to documentation comments
2025-04-26 11:40:14 -04:00
DavidJCobb
b4ee45f3e8
Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_
...
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.
I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
2025-04-26 11:37:20 -04:00
DavidJCobb
8f5c1a452d
Update battle_controllers.h
...
Simplified macros.
2025-04-26 01:33:17 -04:00
DavidJCobb
2738d11b0f
Additional fixes to last few commits
...
ROM now compiles, but it's not comparing as equal...
2025-04-26 01:00:16 -04:00
DavidJCobb
a4370ffcde
gBattleControllerExecFlags bits now identified via helper macros
...
Created "exposition" macros to describe operations performed on gBattleControllerExecFlags. Updated the battle engine internals to use them, to more clearly document how battle link communications actually work.
2025-04-26 00:45:03 -04:00
DavidJCobb
9dc48899d3
BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names
...
Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type.
Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility.
2025-04-26 00:13:42 -04:00
PCG
68598e232e
Disable P_TUTOR_MOVES_ARRAY config ( #6693 )
2025-04-25 12:33:03 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs ( #6687 )
2025-04-24 19:34:37 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. ( #6634 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
khbsd
971a595e4a
Evolution Refactor ( #6556 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
Alex
d3fe5c4640
Some Me First tests plus minor clean up ( #6678 )
2025-04-23 12:18:57 +02:00
Alex
71cfab6477
Fixes Magician Life Orb interaction ( #6676 )
2025-04-22 21:01:00 +02:00
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend ( #6671 )
2025-04-21 22:52:55 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction ( #6645 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
AlexOn1ine
e2e012c3a9
conflicts
2025-04-21 15:50:57 +02:00
Alex
db7e45f1d6
Sky Drop clean up and tests ( #6218 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 23:07:46 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget ( #6627 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation ( #6656 )
2025-04-20 22:36:27 +02:00
khbsd
6b8e680139
Remove hardcoded values from wild_encounter.h generation ( #6640 )
...
Co-authored-by: Moos Toet <moostoet@hotmail.com>
2025-04-20 22:27:36 +02:00
Alex
6b09480912
Fixes some restore issues ( #6629 )
2025-04-18 16:57:04 -04:00
grintoul1
ec2aef2eff
Battle Transition: mugshots for multibattles ( #6567 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-17 16:18:20 +02:00
AlexOn1ine
fd0766c7fa
17-04-25-master-merge
2025-04-17 14:14:37 +02:00
Bassoonian
1c3d346d4f
Make form change methods into enum + type checking ( #6631 )
2025-04-16 23:45:41 +02:00
Bassoonian
cca969b04d
Adds move effect type checking ( #6618 )
2025-04-16 00:08:57 +02:00
Bassoonian
512368fd03
Add type checking for hold item effects ( #6619 )
2025-04-15 23:33:00 +02:00
