AlexOn1ine
d4e7e7ad36
10/11/25 Master to upcoming merge
2025-11-01 11:54:17 +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
FosterProgramming
712e087754
Fix move description prompt window not appear when choosing a move after canceling target selection ( #8055 )
2025-10-29 17:53: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
AlexOn1ine
6acabd4ba2
Master to upcoming merge
2025-10-25 16:19:32 +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
Eduardo Quezada
5276f2bc6b
Fixed Max Move in-battle descriptions ( #8004 )
2025-10-21 20:49:48 +02:00
AlexOn1ine
e365add4cf
15/10/25 Master to upcoming merge
2025-10-15 21:31:00 +02:00
Alex
eee546df06
Item battle effect refactor ( #7857 )
2025-10-12 08:59:33 +02:00
FosterProgramming
ca53ccb55e
Fix shiny stars being freed before shiny animation was played ( #7917 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-11 19:54:51 +02:00
RavePossum
7cf9185477
Fix right player position battle partner target display ( #7878 )
2025-10-08 10:39:06 +02:00
Alex
a818b97732
GetBattlerHoldEffect clean up ( #7819 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-29 17:16:15 +02:00
Alex
b2c5a82003
Add func GetChosenMoveFromPosition ( #7810 )
2025-09-27 18:25:57 -04:00
AlexOn1ine
bc73f4654b
merge master 31/07/25
2025-08-01 12:18:11 +02:00
ghoulslash
219823f9a9
Fix Incompatible Z-Move Activation ( #7399 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-25 10:49:15 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code ( #7262 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Hedara
51a5577f65
Merge branch 'master' into master-upcoming
...
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
2025-06-25 14:17:07 +02:00
cawtds
59350cc32f
Increase party action limit ( #7119 )
2025-06-24 15:15:04 +02:00
Pablo Pena
e449a612f5
fix: use BackPickId to calculate player intro ball throw animation palette ( #7193 )
2025-06-23 19:45:12 +02:00
Eduardo Quezada
b094b70dc5
More battle controller function consolidation. ( #6877 )
2025-06-21 10:59:41 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) ( #7018 )
2025-06-18 10:59:24 +02:00
Alex
d4146afcae
Add damage context to effectiveness multiplier ( #7111 )
2025-06-14 11:05:14 +02:00
Hedara
bdd7c5bfa8
Merge branch 'master' into master-merge
...
Conflicts:
src/contest_painting.c
2025-06-09 23:27:18 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities ( #7043 )
2025-06-03 22:05:22 +02:00
Alex
d33651bfd0
Battle controller pret documentation ( #7029 )
2025-06-02 14:22:11 +02:00
Eduardo Quezada
8697bef20c
BtlController_EmitTwoReturnValues cleanup (#6855 )
2025-06-01 11:29:02 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Hedara
2e4833240f
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
...
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
2025-05-24 21:24:56 +02:00
Hedara
90aed43c27
Merge branch 'master' into master-upcoming
...
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
Alex
8ec998abff
Fixes ate type being ignored after checking summary screen ( #6888 )
2025-05-22 14:07:36 +02:00
AlexOn1ine
33607529cd
conflicts
2025-05-16 10:46:32 +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
Bassoonian
e42890e954
Consolidates a bunch of battle controller functions ( #6838 )
2025-05-15 11:26:18 +02:00
Eduardo Quezada
13071f7019
Added IsOnPlayerSide
2025-05-12 13:53:15 -04:00
Eduardo Quezada
392d662c12
Rename GetPartyBattlerData to GetBattlerMon ( #6800 )
2025-05-09 15:14:09 +02:00
Alex
2044bea883
Rename battlerId to battler for consistency ( #2126 )
2025-05-09 12:43:23 +01:00
Eduardo Quezada
addebea4d6
Better handling of battle coords ( #6787 )
2025-05-07 22:25:10 +02:00
Eduardo Quezada
1f23fe0dd3
Use GetPartyBattlerData where appropiate ( #6779 )
2025-05-06 17:13:50 +02:00
DavidJCobb
0f17e70371
Shorter names for engine/controller communication enum members
2025-05-02 00:01:15 -04:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02: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
d8721b668e
Fixed find-and-replace mistake
...
Functions were using the wrong constant.
2025-04-26 10:54:22 -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
Bassoonian
cca969b04d
Adds move effect type checking ( #6618 )
2025-04-16 00:08:57 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups ( #4901 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-12 10:23:48 +02:00
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves ( #6559 )
2025-04-12 01:03:45 +02:00
Hedara
2210e2d410
Merge branch 'master' into upcoming-master
2025-04-09 11:06:38 +02:00
aronson
692f7968fc
Use non-preproc guards on AI frame count
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-31 12:06:12 -05:00
