AlexOn1ine
|
f4c64a2d79
|
conflicts
|
2025-05-30 19:20:32 +02:00 |
|
psf
|
9656400f88
|
Moved time constants to dedicated files (#7019)
|
2025-05-30 16:39:01 +02:00 |
|
cawtds
|
1e32cf278c
|
fix battle controller macros (#7021)
|
2025-05-30 16:31:38 +02:00 |
|
Alex
|
213503dee9
|
Fixes spread move fire types not defrosting all targets (#6998)
|
2025-05-29 11:25:10 +02:00 |
|
Hedara
|
c8570d7c2b
|
Remove incorrectly re-added ABILITYEFFECT_ cases
|
2025-05-28 14:38:57 +02:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
psf
|
d80e92e687
|
Pret merge (27th of May, 2025) (#6995)
|
2025-05-28 03:44:51 -07:00 |
|
Alex
|
c489d36fc6
|
Fixes Gen3 berry activation timing (#6993)
|
2025-05-27 23:36:00 +02:00 |
|
Hedara
|
156e0b394c
|
Start of 1.11.4 cycle
|
2025-05-27 20:34:28 +02:00 |
|
Hedara
|
7d1833f277
|
1.11.3 release
|
2025-05-27 20:33:27 +02:00 |
|
Hedara
|
647c786c53
|
Merge commit '07c897a' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:46:13 +02:00 |
|
Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +02:00 |
|
Hedara
|
5e9b8cdbad
|
Merge commit 'cc388ef' into pret-merge
Conflicts:
src/map_name_popup.c
|
2025-05-27 19:06:35 +02:00 |
|
Hedara
|
4a442cc3e6
|
Merge commit '091b726' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:02:53 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
Hedara
|
090550626e
|
Merge commit '113226b03ad745183299dae1833f2a773b927cef' into pret-merge
Conflicts:
include/constants/metatile_behaviors.h
|
2025-05-27 18:34:53 +02:00 |
|
Alex
|
983f8e34a1
|
Fixes repeated learning of level up moves (#6981)
|
2025-05-26 14:15:16 -07:00 |
|
Bivurnum
|
46e2e676c6
|
Make setobjextxy work with npc followers during ON_WARP map script (#6913)
|
2025-05-26 18:59:14 +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
|
3ecd8afab0
|
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
Conflicts:
Makefile
|
2025-05-24 20:42:01 +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
|
a90dd491d2
|
Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge
|
2025-05-24 19:35:01 +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
|
f9400332fc
|
Fixes AI repeated use of weather set up moves (#6963)
|
2025-05-22 16:50:13 -04:00 |
|
Alex
|
48100e9593
|
Fixes Unnerve activation not limited to 1 per switch-in (#6960)
|
2025-05-22 19:15:01 +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
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Alex
|
8ec998abff
|
Fixes ate type being ignored after checking summary screen (#6888)
|
2025-05-22 14:07:36 +02:00 |
|
surskitty
|
63d1a9b3d9
|
Commenting in config files to explain limits of map popups and wild AI flags (#6923)
|
2025-05-21 16:15:35 +02:00 |
|
khbsd
|
ddc662fd32
|
fix: avoid unexpected data shifting by removing preproc'd array size (#6916)
|
2025-05-20 17:09:04 +02:00 |
|
Kurausukun
|
bd0a02c456
|
Correct C23 Checks (#2144)
|
2025-05-19 15:43:06 +01:00 |
|
Bassoonian
|
59d315734d
|
Update header files to match source files (#2143)
|
2025-05-19 09:18:04 +01:00 |
|
Kurausukun
|
e1e7d1cf35
|
Fixes for C23 Support (#2138)
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
|
2025-05-19 09:11:59 +01:00 |
|
Alex
|
f1c1906324
|
Fix misleading name (#6865)
|
2025-05-17 16:23:30 +02:00 |
|
Eduardo Quezada
|
406fd7ce81
|
Expand trainerproc to support additional battle types (#6770)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-17 15:08:44 +02:00 |
|
Bassoonian
|
54806c8838
|
Add no-whiteout feature (#6795)
|
2025-05-17 11:20:35 +02:00 |
|
Eduardo Quezada
|
edf7c67775
|
Remove non-volatile status EFFECTs (#6772)
|
2025-05-16 22:52:51 +02:00 |
|
Alex
|
73e65b76c4
|
Consolidated HasMoveFlagX functions (#6874)
|
2025-05-16 20:50:45 +02:00 |
|
surskitty
|
e44d0326be
|
AI double battle friendly fire logic improvements (#6766)
|
2025-05-16 11:41:03 -04: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 |
|
hedara90
|
4d4dea1b38
|
Master to upcoming merge (#6868)
|
2025-05-16 09:37:39 +02:00 |
|
spindrift64
|
38cd80760b
|
Gen 1 no recharge on KO (#6869)
|
2025-05-16 08:09:18 +02:00 |
|
Eduardo Quezada
|
3056909286
|
Added weather accuracy move flags (#6857)
|
2025-05-16 07:58:40 +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
|
578c5f96cd
|
Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
Conflicts:
include/battle_gfx_sfx_util.h
src/apprentice.c
src/battle_controller_recorded_opponent.c
src/battle_controller_recorded_player.c
src/battle_dome.c
src/battle_gfx_sfx_util.c
src/battle_script_commands.c
src/battle_tv.c
src/item_menu.c
src/move_relearner.c
src/pokemon.c
src/scrcmd.c
|
2025-05-15 21:31:54 +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 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
Pawkkie
|
0cfcc7fb87
|
Add prediction function (#6858)
|
2025-05-15 11:55:26 -04:00 |
|