Eduardo Quezada
4a4a72f9fb
Added enum BattlerId type checks ( #8954 )
2026-01-28 09:32:03 +01:00
Bassoonian
786c3d948f
Battle file cleanup & documentation ( #8903 )
2026-01-14 12:17:21 +01:00
Bassoonian
3755e51a24
Move enum ( #8739 )
2026-01-03 17:43:48 +01:00
grintoul
a71fc91484
Trainer slides for multiple trainers and multibattles ( #7588 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-30 20:28:53 +00:00
Moos Toet
29516be23a
simplify name
2025-12-13 18:17:21 +01:00
Moos Toet
dad74300ea
fix: fainted mon on first turn with hazards no longer bugs out
2025-12-13 18:15:03 +01:00
Alex
0fd0e50d8a
Renames for struct BattleContext and DamageContext ( #8426 )
2025-12-04 13:52:15 -05:00
Alex
f222bcaff5
Switch-in Events Refactor ( #8128 )
2025-11-30 08:25:20 -08:00
Bassoonian
f7cbe4853b
Add type enum ( #8054 )
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-10-27 16:41:22 +00:00
Alex
a77f8d97a1
Optimize GetWhichBattlerFasterOrTies ( #7953 )
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-10-15 15:08:16 +02:00
Alex
eee546df06
Item battle effect refactor ( #7857 )
2025-10-12 08:59:33 +02:00
Alex
3ea095a941
More White Herb fixes/clean up ( #7826 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-30 21:16:02 +02:00
khbsd
e385c7f59f
feat: change defines in constants/abilities.h to an enum ( #7006 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-29 21:35:09 +02:00
Alex
3c9f05b367
Fixes activation order for a couple abilities ( #7732 )
2025-09-27 18:47:10 +02:00
AlexOn1ine
165e7502bc
Instant Win option in Battle Debug
2025-07-13 16:21:37 +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
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects ( #7002 )
2025-06-25 21:15:40 +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
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
Bassoonian
59d315734d
Update header files to match source files ( #2143 )
2025-05-19 09:18:04 +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
2044bea883
Rename battlerId to battler for consistency ( #2126 )
2025-05-09 12:43:23 +01:00
Eduardo Quezada
5820cc99f6
battle_main enum cleanup (#6788 )
2025-05-08 13:34:33 +02:00
Bassoonian
512368fd03
Add type checking for hold item effects ( #6619 )
2025-04-15 23:33:00 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles ( #6456 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
Alex
7bf156be0e
Refactors Move absorb / block function calls to remove redundancy ( #6490 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-08 14:26:18 +02:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
6d020eb366
Cleaned up duplicate dynamic type functions ( #5338 )
...
* Cleaned up duplicated dynamic type functions
* Small cleanup
* Oops, last cleanup broke stuff
* Alignment
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-08 19:14:05 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
Martin Griffin
9d97537ee2
Fix speed ties ( #4780 )
...
* Fix speed ties
* fixup! Fix speed ties
* fixup! Fix speed ties
* fixup! fixup! Fix speed ties
* fixup! Fix speed ties
* Workaround for Comatose-Ditto interaction
2024-08-03 17:29:47 +02:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Eduardo Quezada
ee1d14755a
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-06-02 11:06:41 -04:00
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks ( #4462 )
...
* Set TYPE_MYSTERY as type 0
* Remove redundant TYPE_NONE
* Moved Gen 1-3 type damage categories to gTypesInfo
* Set TYPE_NONE as 0 instead
* Grouped type info to a single file
* Fixed sTypeEffectivenessTable static name
* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs
* oops, missed the extern
* Moved Tera Type RGB values to gTypesInfo
* Fixed Tera Type test
* Added option test feature to set IVs
* Hidden Power type test
* Tera Type safeguard in givemon
* Removed isHiddenPowerType for a future PR that refactors Hidden Power
* Review changes
2024-06-01 07:38:22 +02:00
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_3_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
Frank DeBlasio
2f4203bc4c
Consolidate type properties ( #4185 )
...
* Moved gTypeNames into gTypes
* Added invalid move text to struct
* Added max move to struct
* Added icon palette to struct
* Added macros for invalid and max moves
* Swapped palette and max move order
* Renamed invalid to generic
* Renamed invalid to generic in struct definition
* Added zMoves and items to type struct
* Addressed comments
* Incorporated newer comments
* Updated comment format
2024-03-12 07:57:38 -03:00
Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
Frank DeBlasio
4d5c572d0c
Refactor trainer classes ( #3875 )
...
* Created TrainerClass struct
* Added money multiplier to TrainerClass struct
* Added Poke Balls to struct
* Condensed gTrainerClasses
* Simplified trainer Poke Balls
* Moved trainer classes into battle_main.c
* Removed complicated ball macro
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-04 13:30:42 +01:00
Bassoonian
6bc0bf9f8b
Ability refactor ( #3861 )
...
* Ability refactor
* Adds abilities to RHH rom header
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-12-29 14:25:24 +01:00
DizzyEggg
6137db102e
Ally Switch ( #3533 )
...
* ally switch move animation
* Ally Switch anim done
* ally switch test and improve animation
* derp
* add ally switch known failing test for ally targeting moves
* moves which targetted ally fail after ally switch
* ally switch works like protect
---------
Co-authored-by: root <root@LAPTOP-3SNV7DEQ>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-20 15:26:28 +01:00
DizzyEggg
8d238c88b9
Follow -1, 1, 0 convention for comparision functions ( #3777 )
...
* change comparision functions to use -1, 1, 0
* m
2023-12-20 14:47:14 +01:00
sbird
b77bc71862
fix -Warray-parameter, -Waddress, -Warray-bounds warnings
...
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
2023-10-16 09:36:36 +01:00
DizzyEggg
bb9501449c
final ai optimizations
2023-09-14 11:05:00 +02:00
DizzyEggg
1a64938c9b
optimize dmg move result and ai who is faster
2023-09-13 13:23:19 +02:00
DizzyEggg
9778587935
optimize battle util and item functions by setting u32 variables
2023-09-13 00:02:26 +02:00
DizzyEggg
44bd830d2a
optimize dmg calc and ai dmg calc to reduce lag
2023-09-12 23:20:09 +02:00
DizzyEggg
0381ccdf32
remove more of gActiveBattler
2023-08-29 16:20:16 +02:00
