grintoul
|
d55d2b6dfc
|
Corrects test system Forced Ability handing for multi battles (#8611)
|
2025-12-22 10:11:21 +01:00 |
|
hedara90
|
8ae810fdc8
|
Fix move anim tests sometimes leaking tasks (#8493)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-12-10 12:38:56 +01:00 |
|
FosterProgramming
|
37a0ef9941
|
Give dead mons priority over eggs when assigning battlers (#8473)
|
2025-12-08 13:13:07 +01:00 |
|
hedara90
|
ce858f51b2
|
27/11/25 Master to upcoming merge (#8359)
|
2025-11-27 21:07:59 +01:00 |
|
grintoul
|
a885abe106
|
Fix player and partner trainer sprite palettes to 8 and 9, preventing unwanted palette changes (#8127)
|
2025-11-27 17:42:59 +01:00 |
|
AlexOn1ine
|
68300e0f9a
|
27/11/25 Master to upcoming merge
|
2025-11-27 13:39:12 +01:00 |
|
psf
|
1ea0500b95
|
Fixed broken friendship from items in battle test and added new test for opposite case (#7872)
|
2025-11-24 06:55:30 +00:00 |
|
AlexOn1ine
|
aa20b2bc0f
|
master to upcoming merge
|
2025-11-22 10:39:52 +01:00 |
|
Eduardo Quezada
|
e5e99317d0
|
Slightly increase headless test speed by modifying animations (#8299)
|
2025-11-20 14:01:02 +01: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 |
|
Bassoonian
|
fbd702e3a4
|
Some more documentation and cleanup (#8020)
|
2025-10-23 20:14:38 +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 |
|
FosterProgramming
|
2156651313
|
No bag use flag changed to a varable (#7780)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-01 14:51:09 +02:00 |
|
AlexOn1ine
|
1131b205f2
|
conflicts
|
2025-08-28 14:09:38 +02:00 |
|
RavePossum
|
2fbf45d057
|
Restore X item friendship increase (#7583)
|
2025-08-26 22:17:30 +02:00 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +02:00 |
|
hedara90
|
95eb3ba1a7
|
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-08-21 14:43:41 +02:00 |
|
Linathan
|
9faa5294ce
|
Wild Pokémon animate after breaking out of Poké Ball (#7339)
|
2025-08-01 18:14:42 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
AlexOn1ine
|
90eef35715
|
master merge
|
2025-07-19 17:01:18 +02:00 |
|
PhallenTree
|
19c9aa508d
|
Fixes shadows and mon animations for Illusioned battlers (#7347)
|
2025-07-16 22:31:06 +02:00 |
|
mudskipper13
|
688ec0023e
|
battle intro: fix issues with follower slide-in and wild shiny mon (#7325)
|
2025-07-13 20:47:14 +02:00 |
|
Hedara
|
a7e60ae08a
|
Merge branch 'master' into merge-for-pawkkie
|
2025-07-12 21:29:30 +02:00 |
|
Pawkkie
|
b55ee2288b
|
Fix AI seeing switchin abilities wrong in tests (#7328)
|
2025-07-12 21:28:05 +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 |
|
GriffinR
|
2a7a4f1e76
|
Merge pull request #2127 from AsparagusEduardo/_pret/maxLinkPlayers
Fix other missing instances of MAX_LINK_PLAYERS
|
2025-06-25 22:05:13 -04: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 |
|
Eduardo Quezada
|
b5956d8eba
|
Fix healthbox when blending effects happen (#7203)
|
2025-06-24 23:15:16 +02:00 |
|
cawtds
|
59350cc32f
|
Increase party action limit (#7119)
|
2025-06-24 15:15:04 +02:00 |
|
DizzyEggg
|
93511ceb05
|
Fix BtlController_EmitChosenMonReturnValue UB (#7197)
|
2025-06-24 09:28:26 +02:00 |
|
Eduardo Quezada
|
cf7f15faac
|
Untangle InitBtlControllers functions (#6748)
|
2025-06-22 16:21:37 +02:00 |
|
Eduardo Quezada
|
b094b70dc5
|
More battle controller function consolidation. (#6877)
|
2025-06-21 10:59:41 +02:00 |
|
Alex
|
d33651bfd0
|
Battle controller pret documentation (#7029)
|
2025-06-02 14:22:11 +02:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Hedara
|
2b92ba315a
|
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
|
2025-05-24 20:38:21 +02:00 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +02:00 |
|
Eduardo Quezada
|
17e570407e
|
Remove trailing whitespace (#6968)
|
2025-05-23 22:33:12 +02:00 |
|
Bassoonian
|
59d315734d
|
Update header files to match source files (#2143)
|
2025-05-19 09:18:04 +01:00 |
|
Bassoonian
|
16357c7e29
|
Streamline pointer notation (#2139)
|
2025-05-16 12:04:44 +01:00 |
|
AlexOn1ine
|
33607529cd
|
conflicts
|
2025-05-16 10:46:32 +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
|
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
|
3b6dbf38fd
|
Review changes
|
2025-05-12 20:53:14 -04:00 |
|
Eduardo Quezada
|
13071f7019
|
Added IsOnPlayerSide
|
2025-05-12 13:53:15 -04:00 |
|
Alex
|
51b000860b
|
Add BattlerId enum and document (#2135)
|
2025-05-11 07:36:39 +01:00 |
|
PhallenTree
|
48c08c0368
|
Illusion struct cleanup and many Illusion fixes (#6798)
|
2025-05-09 20:41:20 +02: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
|
1f23fe0dd3
|
Use GetPartyBattlerData where appropiate (#6779)
|
2025-05-06 17:13:50 +02:00 |
|