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
DavidJCobb
0f17e70371
Shorter names for engine/controller communication enum members
2025-05-02 00:01:15 -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
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
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
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
Bassoonian
6a70f4f390
Turn battle string ids into enums ( #6594 )
2025-04-13 16:12:30 +02:00
Hedara
08a2ad2c98
Merge branch 'upcoming' into merrps-dns
2025-04-09 10:01:51 +02:00
psf
b60fcc9a72
Add B_ANIMATE_MON_AFTER_KO - mons animate after scoring a KO ( #6451 )
2025-03-26 11:39:25 +01:00
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
明雅
846fe64789
Try a new solution to Fix Safari #6206 ( #6228 )
2025-02-10 15:55:57 +01:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
Eduardo Quezada
cd84e07341
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-23 23:01:25 -03:00
hedara90
e8d3b4163f
Trainerslide animation fix ( #6040 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 14:50:23 +01:00
Alex
ac9c8ac3bb
Replace WEATHER_HAS_EFFECT with HasWeatherEffect ( #6069 )
2025-01-21 08:43:45 +01:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep ( #6019 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-15 14:07:12 +01:00
Eduardo Quezada
ce40c3356c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-12 08:42:57 -03:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues ( #6005 )
2025-01-12 09:49:19 +01:00
ghoulslash
401df8da4d
move overwrittenAbilities field to DisableStruct ( #5946 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-03 18:17:23 +01:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
6b8665d08f
Speed up tests in headless mode ( #5889 )
2025-01-01 10:24:23 +01:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
