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 |
|
Alex
|
31a561201b
|
Adds hazard queue (#7295)
|
2025-07-07 15:30:35 -04:00 |
|
Alex
|
2531613a52
|
Fixes Eject Pack not resolving correctly during switch in effects (#7002)
|
2025-06-25 21:15:40 +02:00 |
|
Alex
|
7d7ffd58ae
|
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-06-25 18:20:55 +02:00 |
|
Bassoonian
|
6333702461
|
Converts more defines to enums and name unnamed enums (#7071)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-06-18 14:30:37 +02:00 |
|
Alex
|
aa78420b9e
|
Deprecate absent member from battlerState (#7091)
|
2025-06-12 10:41:46 +02:00 |
|
Alex
|
fd856e5068
|
Removes duplicate AI ability func (#7045)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-06-09 11:30:16 +02:00 |
|
Bassoonian
|
1a6ed20713
|
Add dedicated getter functions for Pokémon types and abilities (#7043)
|
2025-06-03 22:05:22 +02:00 |
|
Eduardo Quezada
|
8697bef20c
|
BtlController_EmitTwoReturnValues cleanup (#6855)
|
2025-06-01 11:29:02 +02:00 |
|
jfb1337
|
096493aa35
|
AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705)
Co-authored-by: jfb1337 <>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-31 09:47:25 +02:00 |
|
Alex
|
983f8e34a1
|
Fixes repeated learning of level up moves (#6981)
|
2025-05-26 14:15:16 -07:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +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 |
|
Alex
|
48100e9593
|
Fixes Unnerve activation not limited to 1 per switch-in (#6960)
|
2025-05-22 19:15:01 +02: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
|
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 |
|
Alex
|
44d9b9c9e6
|
Further moveend changes (move blocks) (#6820)
|
2025-05-15 12:43:50 +02:00 |
|
Alex
|
34918f5f0d
|
Fixes wrongly usage of arguments without checking effect (#6859)
|
2025-05-15 10:39:31 +02:00 |
|
AlexOn1ine
|
1a773a5916
|
conflicts
|
2025-05-14 23:21:33 +02:00 |
|
Eduardo Quezada
|
5f0a853e74
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide
|
2025-05-12 20:58:27 -04:00 |
|
Eduardo Quezada
|
3b6dbf38fd
|
Review changes
|
2025-05-12 20:53:14 -04:00 |
|
Alex
|
006abe097e
|
Add AI_FLAG_PREDICT_MOVES (#6551)
|
2025-05-12 23:10:10 +02:00 |
|
Eduardo Quezada
|
13071f7019
|
Added IsOnPlayerSide
|
2025-05-12 13:53:15 -04:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
AlexOn1ine
|
4959187d97
|
fix conflicts
|
2025-05-09 21:47:53 +02: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 |
|
Alex
|
9060d401c9
|
Adds partyState to BattleStruct (#6783)
|
2025-05-09 12:29:54 +02:00 |
|
Pawkkie
|
b48d0c387d
|
Throw out unnecessary functions
|
2025-05-08 14:49:49 -04:00 |
|
Pawkkie
|
83b7732fae
|
Store predictingMove, config for chance
|
2025-05-08 14:19:43 -04:00 |
|
Pawkkie
|
1e57670b34
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-05-08 13:58:18 -04:00 |
|
Eduardo Quezada
|
5820cc99f6
|
battle_main enum cleanup (#6788)
|
2025-05-08 13:34:33 +02:00 |
|
Alex
|
1871d16ffa
|
Refactor battler message ids (#6765)
|
2025-05-07 00:24:10 +02:00 |
|
Alex
|
4e7b1f2a97
|
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762)
|
2025-05-06 12:07:01 +02:00 |
|
Pawkkie
|
3f5335c4ba
|
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
|
2025-05-04 17:16:34 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
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 |
|
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 |
|
Alex
|
55f9f6adea
|
Refactor battler flee and watch options + clean up (#6724)
|
2025-04-30 11:54:42 -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 |
|
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
|
4970b3bd95
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 00:33:42 -04:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|