Alex
|
6824e7d175
|
Attackcanceller clean up (#7210)
|
2025-06-25 21:36:15 +02:00 |
|
Bolt-Strike
|
f217344cb5
|
Disable unowned evo methods (#7103)
|
2025-06-25 21:29:59 +02:00 |
|
Alex
|
2531613a52
|
Fixes Eject Pack not resolving correctly during switch in effects (#7002)
|
2025-06-25 21:15:40 +02:00 |
|
Bivurnum
|
c6221fa50e
|
Add debug options for follower NPCs (#7215)
|
2025-06-25 21:13:43 +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 |
|
Hedara
|
c0a50096f3
|
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
|
2025-06-25 17:54:59 +02:00 |
|
Hedara
|
1916703e5a
|
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
|
2025-06-25 17:49:19 +02:00 |
|
Hedara
|
3ce34c41b6
|
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
Conflicts:
include/follower_helper.h
src/follower_helper.c
|
2025-06-25 17:20:38 +02:00 |
|
Alex
|
f8551830c9
|
Adds Gen5+ Encore config (#7051)
|
2025-06-25 15:58:30 +02: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 |
|
Bivurnum
|
bfb0c2fa73
|
Added createfollowernpc macro to make a new follower from a gfx id (#7196)
|
2025-06-25 10:59:25 +02:00 |
|
Ariel A
|
7564262543
|
Merge branch 'followers' into lighting
|
2025-06-24 20:44:44 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
Ariel A
|
1f2fe7396b
|
feat: added abnormal weather follower message
Includes support for follower matching != species
|
2025-06-24 20:19:23 -04:00 |
|
cawtds
|
59350cc32f
|
Increase party action limit (#7119)
|
2025-06-24 15:15:04 +02:00 |
|
Hedara
|
726f18f360
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
|
2025-06-24 10:42:24 +02:00 |
|
DizzyEggg
|
e1b83d6056
|
Match graphics declarations with externs (#2089)
CI / build (push) Has been cancelled
|
2025-06-23 20:31:18 +01:00 |
|
psf
|
456a8f6aa0
|
Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184)
|
2025-06-23 15:40:13 +02:00 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +02:00 |
|
i0brendan0
|
0ccf797cce
|
Fixes Roamers not saving shininess (#7185)
|
2025-06-23 15:05:01 +02:00 |
|
Bassoonian
|
c34ec8956d
|
Master to upcoming merge, 20/06/25 (#7169)
|
2025-06-23 10:04:44 +02:00 |
|
DizzyEggg
|
53f8ae11ff
|
Move gTradePlatform_Tilemap to header (#2088)
|
2025-06-22 19:48:37 -04: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 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
Bassoonian
|
24fdac662e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
|
2025-06-19 14:32:23 +02:00 |
|
Daniel Walls
|
cc33d6171b
|
Add config options for removing bard phoneme audio to save ROM space (#7155)
|
2025-06-18 20:16:25 -07:00 |
|
Eduardo Quezada
|
8a0bc495d5
|
Fixed description of FORM_CHANGE_WITHDRAW (#7152)
|
2025-06-18 22:09:59 +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 |
|
PhallenTree
|
340d815c6d
|
Stat Change (Animation) Refactor (#7144)
|
2025-06-18 14:24:35 +02:00 |
|
Alex
|
ab1838ffd8
|
Repurposes IsMagicGuardProtected into a general function (#7114)
|
2025-06-18 12:56:03 +02:00 |
|
Eduardo Quezada
|
800829538c
|
Compound strings for hold effect names (#7140)
|
2025-06-18 11:38:42 +02:00 |
|
Nephrite
|
a18709fb47
|
Bag refactor (groundwork for expansion) (#7018)
|
2025-06-18 10:59:24 +02:00 |
|
Nephrite
|
06cd3af3ea
|
Volatile status refactoring (#6983)
|
2025-06-18 07:22:41 +02:00 |
|
Eduardo Quezada
|
5966852f8d
|
Removed Mind Blown effect in favor of move flag (#7138)
|
2025-06-17 00:02:46 +02:00 |
|
Eduardo Quezada
|
651e87af5f
|
Converted Relic Song into a proper form change (#7139)
|
2025-06-17 00:02:25 +02:00 |
|
Alex
|
e2f0767be5
|
Decouple Status set by ability from SetMoveEffect (#7125)
|
2025-06-16 14:45:21 +01:00 |
|
hedara90
|
b2a0107a68
|
Test runner fixes (#7100)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-15 12:02:29 +02:00 |
|
cawtds
|
3491cd95e8
|
Fix sell price display (#7123)
|
2025-06-15 11:52:51 +02:00 |
|
Alex
|
c6b4118c3c
|
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112)
|
2025-06-14 11:06:23 +02:00 |
|
Alex
|
d4146afcae
|
Add damage context to effectiveness multiplier (#7111)
|
2025-06-14 11:05:14 +02:00 |
|
Alex
|
e1b542944f
|
Refactor damage calculations aruguments by using a struct context (#7108)
|
2025-06-13 14:16:40 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
Alex
|
aa78420b9e
|
Deprecate absent member from battlerState (#7091)
|
2025-06-12 10:41:46 +02:00 |
|
Pawkkie
|
3db12a0ae6
|
Haze Boosting AI Followup (#6966)
|
2025-06-11 18:30:22 +02:00 |
|
hedara90
|
c9a49e696e
|
Increased heap by 768 bytes (#7097)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-11 17:55:32 +02:00 |
|
Bassoonian
|
192bc1ec20
|
Master merge (#7093)
|
2025-06-10 22:52:43 +02:00 |
|
Alex
|
cb4ef705f7
|
Remove redundancy for ShouldLowerStat functions (#6577)
|
2025-06-09 21:47:16 -04:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +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 |
|
Emilia Daelman
|
f4ff5e6d26
|
Feature/ai/wide guard quick guard singles (#7086)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-06-08 21:50:34 +02:00 |
|
kittenchilly
|
872bb8785b
|
Simplify white out messages (#6961)
|
2025-06-08 08:52:37 -07:00 |
|
hedara90
|
8489b7a622
|
Added naive line break (#7076)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-06 20:13:07 -07:00 |
|
Linathan
|
dc279f14ba
|
Chloroblast fix (#7008)
|
2025-06-06 21:33:56 +02:00 |
|
Eduardo Quezada
|
d795de9e9d
|
Remove more instances of hard-coded Move IDs (#7056)
|
2025-06-03 23:26:48 +02:00 |
|
Philipp AUER
|
21f0eb1583
|
Debug parties and battles (#6884)
Co-authored-by: sbird <sbird@no.tld>
|
2025-06-03 23:21:17 +02:00 |
|
Bassoonian
|
1a6ed20713
|
Add dedicated getter functions for Pokémon types and abilities (#7043)
|
2025-06-03 22:05:22 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
cawtds
|
0fc900514b
|
sync list menu functions with firered
|
2025-06-02 22:51:26 +02:00 |
|
Bassoonian
|
c5c7bb13c9
|
Converts a bunch of defines to enums (#7041)
|
2025-06-02 15:54:37 +02:00 |
|
Alex
|
d33651bfd0
|
Battle controller pret documentation (#7029)
|
2025-06-02 14:22:11 +02:00 |
|
Eduardo Quezada
|
8697bef20c
|
BtlController_EmitTwoReturnValues cleanup (#6855)
|
2025-06-01 11:29:02 +02:00 |
|
hedara90
|
392d4db319
|
Fix follower compression (#7038)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-01 10:06:12 +02:00 |
|
Alex
|
ede15918cf
|
Refactors Final Gambit + Tests (#7005)
|
2025-05-31 15:52:53 +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
|
eb81820ae3
|
Clean up battlescript calls with func BattleScriptCall (#6873)
|
2025-05-31 09:09:35 +02:00 |
|
cawtds
|
21499cbee1
|
Refactor field moves (#6660)
|
2025-05-31 09:03:12 +02:00 |
|
PhallenTree
|
fa342b2909
|
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004)
|
2025-05-31 08:45:46 +02:00 |
|
hedara90
|
6e64f6f5ef
|
New sprite compressor (#5627)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
|
2025-05-30 23:10:54 +02:00 |
|
Hedara
|
0e968b31a9
|
Start of 1.13 cycle
|
2025-05-30 21:24:29 +02:00 |
|
Hedara
|
98c03315a9
|
Start of 1.12.1 cycle
|
2025-05-30 20:55:09 +02:00 |
|
Hedara
|
efa2fb3be7
|
Expansion 1.12.0
|
2025-05-30 20:53:32 +02:00 |
|
Hedara
|
09ee1d0b2d
|
Merge branch 'upcoming' into expansion-1.11.4
|
2025-05-30 20:45:19 +02:00 |
|
Hedara
|
acb4a9cf62
|
Expansion 1.11.4
|
2025-05-30 20:15:56 +02:00 |
|
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 |
|
GriffinR
|
0c32d840fa
|
Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
|
2025-05-27 10:53:17 -04: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)
CI / build (push) Has been cancelled
|
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)
CI / build (push) Waiting to run
* 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)
CI / build (push) Has been cancelled
|
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 |
|
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 |
|
Alex
|
44d9b9c9e6
|
Further moveend changes (move blocks) (#6820)
|
2025-05-15 12:43:50 +02:00 |
|
Bassoonian
|
e42890e954
|
Consolidates a bunch of battle controller functions (#6838)
|
2025-05-15 11:26:18 +02:00 |
|
Alex
|
a086d5f592
|
Reverts wrongly done gem fix and renames struggle effect (#6806)
|
2025-05-15 10:45:48 +02:00 |
|
Alex
|
34918f5f0d
|
Fixes wrongly usage of arguments without checking effect (#6859)
|
2025-05-15 10:39:31 +02:00 |
|
Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +02:00 |
|
AlexOn1ine
|
243c43e6a4
|
Add prediction function
|
2025-05-15 08:10:19 +02:00 |
|
AlexOn1ine
|
19e2bb82b5
|
clean up
|
2025-05-14 23:34:43 +02:00 |
|
AlexOn1ine
|
1a773a5916
|
conflicts
|
2025-05-14 23:21:33 +02:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Eduardo Quezada
|
3ef61e6451
|
Combined type-enhancing hold effects (#6846)
|
2025-05-14 13:45:08 +02:00 |
|
ghoulslash
|
5ad8d852fd
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix
|
2025-05-13 08:01:41 -04:00 |
|
Alex
|
de79d6de48
|
Added IsOnPlayerSide (#6832)
|
2025-05-13 12:38:43 +02:00 |
|
Bassoonian
|
2394195123
|
Remove non-existent functions from header files (#6825)
|
2025-05-13 10:52:45 +02:00 |
|
Bassoonian
|
60587682e3
|
Remove redundant script declaration in battle_scripts.h (#6837)
|
2025-05-13 10:32:03 +02:00 |
|
ghoulslash
|
d4c64d3b67
|
rename berrystatraise script to consumablestatraise
|
2025-05-12 21:11:25 -04: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 |
|
Alex
|
7f894ef5fb
|
Fixes a mistake made by me (#6828)
|
2025-05-12 20:08:00 +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 |
|
Eduardo Quezada
|
eadf89e6f9
|
Allow different flags for Badge boost (#6805)
|
2025-05-11 11:36:52 +02:00 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
Alex
|
0ad3f929ab
|
Fixes Berserk Gene infinite loop (#6813)
|
2025-05-11 11:34:16 +02:00 |
|
Alex
|
51b000860b
|
Add BattlerId enum and document (#2135)
CI / build (push) Has been cancelled
|
2025-05-11 07:36:39 +01:00 |
|
spindrift64
|
f4f82f2394
|
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)
|
2025-05-10 22:55:28 +02:00 |
|
Alex
|
4342bfb91d
|
Refactor stockpile resets (#6810)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 20:09:38 +02:00 |
|
spindrift64
|
3b91a964c9
|
Fix Iron Ball type effectiveness check (#6794)
|
2025-05-09 22:23:44 +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 |
|
Alex
|
baf5be2035
|
Replace: moveId -> move, moveIdx -> moveIndex (#2134)
CI / build (push) Has been cancelled
|
2025-05-09 16:33:23 +01: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
|
c7ee329433
|
Full functionality
|
2025-05-08 16:45:10 -04:00 |
|
Pawkkie
|
04278dbfac
|
don't need prints any more
|
2025-05-08 14:52:13 -04: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 |
|
Eduardo Quezada
|
addebea4d6
|
Better handling of battle coords (#6787)
|
2025-05-07 22:25:10 +02:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +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
|
c8fa4442d9
|
Adjust switch AI based on move scoring (#6615)
|
2025-05-06 00:39:44 +02:00 |
|
Pawkkie
|
3f5335c4ba
|
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
|
2025-05-04 17:16:34 +02:00 |
|
Eduardo Quezada
|
96650ffd27
|
Add "Move Item" option in party menu (#6758)
|
2025-05-04 11:40:31 +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 |
|
hedara90
|
68d9c0e456
|
Fix the Move Item option in the PC still expecting compressed palettes (#6739)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 21:43:24 +02:00 |
|
Bivurnum
|
668cd7e413
|
Rename follower npc macros for better specificity and to match documentation (#6742)
|
2025-05-02 21:08:42 +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 |
|
DavidJCobb
|
0f17e70371
|
Shorter names for engine/controller communication enum members
|
2025-05-02 00:01:15 -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 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Pawkkie
|
1a2cd5645a
|
Fix roll handling in AI party damage calcs (#6733)
|
2025-05-01 10:15:19 +02:00 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04:00 |
|
Alex
|
55f9f6adea
|
Refactor battler flee and watch options + clean up (#6724)
|
2025-04-30 11:54:42 -04:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -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
|
f0ecbce9c7
|
Start of 1.11.3 Cycle
|
2025-04-30 11:26:09 +02:00 |
|
Hedara
|
accb85554a
|
Expansion 1.11.2 Release
|
2025-04-30 11:23:05 +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
|
787a8a0d9d
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 13:23:33 -04:00 |
|
Pawkkie
|
7a3cf5d3a3
|
Improve AI's defense against Focus Punch (#6713)
|
2025-04-28 08:34:09 +02:00 |
|
Pawkkie
|
4970b3bd95
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 00:33:42 -04:00 |
|
hedara90
|
5dfbdf56da
|
27/04/25 Master to upcoming merge (#6701)
|
2025-04-27 18:01:50 +02:00 |
|
Bivurnum
|
47723c34e5
|
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-27 14:56:18 +02:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|