7556 Commits

Author	SHA1	Message	Date
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)	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
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)	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)	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
hedara90	d1aa49cca3	Remove compressed palettes (#6455)	2025-04-26 22:58:40 +02:00
Alex	1cd4d23969	Fixes Z and Max moves dmg reduction against side protection (#6697)	2025-04-26 21:46:41 +02:00
DavidJCobb	7ee3043c58	Update battle_controllers.h ... typo	2025-04-26 11:47:48 -04:00
DavidJCobb	2864408060	Tweaks to documentation comments	2025-04-26 11:40:14 -04: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	8f5c1a452d	Update battle_controllers.h ... Simplified macros.	2025-04-26 01:33:17 -04:00
DavidJCobb	2738d11b0f	Additional fixes to last few commits ... ROM now compiles, but it's not comparing as equal...	2025-04-26 01:00:16 -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
PCG	68598e232e	Disable P_TUTOR_MOVES_ARRAY config (#6693)	2025-04-25 12:33:03 +02:00
PCG	f661f3b3ac	Pokedex Plus HGSS move configs (#6687)	2025-04-24 19:34:37 +02:00
Ruby	aba34015db	Time menu for RTC in debug menu. (#6634) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-23 19:34:37 +02:00
khbsd	971a595e4a	Evolution Refactor (#6556) ... Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2025-04-23 16:01:33 +02:00
Alex	d3fe5c4640	Some Me First tests plus minor clean up (#6678)	2025-04-23 12:18:57 +02:00
Alex	71cfab6477	Fixes Magician Life Orb interaction (#6676)	2025-04-22 21:01:00 +02:00
Alex	dfb1cd2ec0	Refactor hit escape moves to use moveend (#6671)	2025-04-21 22:52:55 +02:00
Alex	d220459a01	Fixes Intimidate / Eject Pack interaction (#6645) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-21 17:33:29 +02:00
AlexOn1ine	e2e012c3a9	conflicts	2025-04-21 15:50:57 +02:00
Alex	db7e45f1d6	Sky Drop clean up and tests (#6218) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-20 23:07:46 +02:00
Alex	86969f9919	Remove HitmarkerSwapAttackerTarget (#6627) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-20 22:49:52 +02:00
Eduardo Quezada	c650199909	Added missing gMovesInfo encapsulation (#6656)	2025-04-20 22:36:27 +02:00
khbsd	6b8e680139	Remove hardcoded values from wild_encounter.h generation (#6640) ... Co-authored-by: Moos Toet <moostoet@hotmail.com>	2025-04-20 22:27:36 +02:00
Alex	6b09480912	Fixes some restore issues (#6629)	2025-04-18 16:57:04 -04:00
grintoul1	ec2aef2eff	Battle Transition: mugshots for multibattles (#6567) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-04-17 16:18:20 +02:00
AlexOn1ine	fd0766c7fa	17-04-25-master-merge	2025-04-17 14:14:37 +02:00
Bassoonian	1c3d346d4f	Make form change methods into enum + type checking (#6631)	2025-04-16 23:45:41 +02:00
Bassoonian	cca969b04d	Adds move effect type checking (#6618)	2025-04-16 00:08:57 +02:00
Bassoonian	512368fd03	Add type checking for hold item effects (#6619)	2025-04-15 23:33:00 +02:00
ghoulslash	81ed774c00	EndTurnEffectOrder Refactor (#6224)	2025-04-14 10:57:34 -04:00
LOuroboros	cb98106db0	Corrected Dexnav config related comment (#6610)	2025-04-13 21:49:38 -04:00
GriffinR	709cfa1c9a	Merge pull request #2014 from Bassoonian/battleterrain ... Rename battle terrain to environment	2025-04-13 19:32:06 -04:00
Alex	a4bfbea3cb	Revert wrongly done Embody Aspect fix (#6607)	2025-04-14 00:17:10 +02:00
Alex	a6c73a5885	Adjust enum AIScore (#6598)	2025-04-13 18:54:02 +02:00
Alex	caa878002a	Remove redundant bit for Throat Spray (#6593)	2025-04-13 16:22:04 +02:00
Bassoonian	6a70f4f390	Turn battle string ids into enums (#6594)	2025-04-13 16:12:30 +02:00
Bassoonian	d62205f2fc	Converts some defines to enums (#6592)	2025-04-13 13:39:20 +02:00
Bassoonian	d173e42372	Remove redundant AI defines (#6590)	2025-04-13 11:22:14 +02:00
cawtds	ee911ffbae	FakeRtc datetime and ResetRtcScreen day increments (#5695) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>	2025-04-12 13:17:58 -07:00
Pawkkie	540744024d	"Aerilate"-esque Ability Tests and Config (#6313)	2025-04-12 14:48:58 -04:00
Bassoonian	563e094ea8	Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579)	2025-04-12 12:56:30 -04:00
Hedara	9afd8800f3	Merge branch 'upcoming' into merrps-dns	2025-04-12 16:33:02 +02:00
Bassoonian	d86aedfd32	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr	2025-04-12 14:59:06 +02:00
psf	e146940f25	Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-04-12 10:23:48 +02:00
Hedara	51c3709a56	Review comments	2025-04-12 08:58:23 +02:00
agsmgmaster64	1344d8e9dd	Type Effectiveness Indicators when selecting moves (#6559)	2025-04-12 01:03:45 +02:00
Hedara	3c2cc35158	Match expansion formatting for some preproc	2025-04-11 21:17:52 +02:00
Hedara	301ef288f5	Review comments	2025-04-11 11:37:36 +02:00
Bassoonian	708bb4a831	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr	2025-04-10 23:57:57 +02:00
hedara90	cf98d764ad	Gimmick Indicator refactor (#6553) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-04-10 23:56:26 +02:00
Hedara	d78afca94f	More shadow options and documentation	2025-04-10 22:41:38 +02:00
khbsd	c1ad43b1cc	Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561)	2025-04-10 21:43:21 +02:00
Hedara	b075163c57	Cleanup and config options	2025-04-10 21:17:20 +02:00
Alex	4aca2fdcd3	Refactor fixed damage moves (#6449) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-10 15:01:02 +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
cawtds	1672d99060	make linkDirection more robust to member reordering	2025-04-09 13:40:39 +02:00
Hedara	e419606a10	Merge branch 'upcoming' into merrps-dns	2025-04-09 12:48:18 +02:00
hedara90	3d68061f23	Updated move animation tests (#6554)	2025-04-09 12:17:57 +02:00
Hedara	c8f227903f	Merge branch 'upcoming' into upcoming-master	2025-04-09 11:25:01 +02:00
Alex	f364cf9e71	Alcremie Evolution clean up follow up (#6557)	2025-04-09 11:18:07 +02:00
Hedara	2210e2d410	Merge branch 'master' into upcoming-master	2025-04-09 11:06:38 +02:00
Hedara	08a2ad2c98	Merge branch 'upcoming' into merrps-dns	2025-04-09 10:01:51 +02:00
khbsd	26f28103ec	Add Time-Based Encounters (#6454)	2025-04-09 09:49:09 +02:00
Eduardo Quezada	2b417bfeed	Implemented Alcremie Evolution Method (#6530) ... Co-authored-by: khbsd <khb.dev@gmail.com>	2025-04-08 19:50:21 +02:00
Pawkkie	54928726cb	AI smarter status handling (#6550)	2025-04-08 17:47:45 +02:00
psf	69f2f9f151	Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477)	2025-04-08 16:21:32 +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
Pawkkie	11d26af7a8	Initial attempt, doesn't see move effectiveness / damage	2025-04-08 00:15:28 -04:00
Pawkkie	d7a6e0bea8	Initialize move scores	2025-04-07 23:22:01 -04:00
SundayMoonday	bbe8bbc45b	Replaced Blue Sky background for Rock Field (#6516)	2025-04-07 11:04:21 +02:00
AlexOn1ine	e8cc3c81f8	conflicts	2025-04-06 14:59:12 +02:00
Pawkkie	9cb96235f9	Add basic Unaware check bad move scoring (#6524)	2025-04-02 18:18:33 -04:00
Alex	5b9077e207	Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499)	2025-04-02 23:52:54 +02:00
Alex	c1f18d0765	Refactor protect to allow at least 126 different types of protect eff… (#6506)	2025-04-02 17:26:05 +02:00
Alex	ae62c80d0f	Refactors faint target abilities and adds Battle Bond config (#6519) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-02 16:00:23 +02:00
Alex	edb196e851	Fixes Red Card against Dynamaxed mons (#6526)	2025-04-02 14:28:53 +02:00
AlexOn1ine	0c35879e02	conflicts	2025-04-01 19:11:55 +02:00
hedara90	4f0caf8199	Fixes Tera Type not being carried over to during form change / evolution (#6502)	2025-04-01 16:52:40 +02:00
Isaac Aronson	74e84da571	Remove NDEBUG guard on cycle counter functions	2025-03-31 13:11:18 -05:00
AlexOn1ine	ccebebf64f	31-03-25 Master merge	2025-03-31 18:23:46 +02:00
AlexOn1ine	d767211c4a	helper function to get the species type based on personality	2025-03-31 14:49:40 +02:00
Isaac Aronson	926a7437da	Add AI thinking cycle count display to frame count	2025-03-30 17:24:36 -05:00
Hedara	3615fdde29	START OF 1.11.2 CYCLE	2025-03-30 14:56:39 +02:00
Hedara	e350bea168	Expansion 1.11.1 Release	2025-03-30 14:55:51 +02:00
Alex	23841f6322	Fix hit escape ace mon switching (#6498)	2025-03-29 19:34:37 +01:00
Alex	adf4928fe0	Fixes timesGotHit not increasing on forced switch out (#6493)	2025-03-29 19:33:50 +01:00
Pawkkie	1c0e5bb0e1	fix hit escape switching	2025-03-29 14:18:20 -04:00
Hedara	a3a48c59b8	Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29	2025-03-29 14:21:29 +01:00
Alex	79a2ec1ce2	Fixes Emergency Exit and Eject Pack (#6459)	2025-03-29 14:04:01 +01:00
hedara90	b0c7d1a8ee	Made memory integrity checks run betweeen PARAMETRIZE runs (#6462) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-03-28 21:43:04 +01:00
Martin Griffin	71a5542168	metaprogram.h without global.h (#6469)	2025-03-28 21:21:58 +01:00
Alex	ce3d6a924a	Fixes clear body type effect and clear amulet against protect effects (#6482)	2025-03-28 11:35:06 +01:00
psf	b60fcc9a72	Add B_ANIMATE_MON_AFTER_KO - mons animate after scoring a KO (#6451)	2025-03-26 11:39:25 +01:00
AlexOn1ine	ae640f0714	25-03-25 master to upcoming merge	2025-03-25 21:39:58 +01:00
Alex	5ec301f04a	Removes unused Special Status members (#6479)	2025-03-25 21:15:25 +01:00
hedara90	a36f838d76	AI gimmick check changed from checking trainer data to a BattleStruct field (#6478) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-03-25 20:01:34 +01:00
Hedara	521432b269	Renamed a berry tag variable	2025-03-24 13:47:47 +01:00
Alex	b93976c980	Fixes Cheek Pouch mutating damage (#6466)	2025-03-23 23:34:24 +01:00
ghoulslash	051adbdce2	Fix DexNav search level (#6421)	2025-03-23 11:29:51 -04:00
hedara90	08f11ca5c1	Update the All Move Animations test (#6460) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-03-21 22:33:03 +01:00
Alex	c707df358e	Clean up AI code duplication and unify checks (#6348)	2025-03-20 22:50:01 +01:00
Pawkkie	4c18e88282	Improve "all moves bad" switching (#6453)	2025-03-20 16:43:56 +01:00
Alex	5c05715585	Adds move description battle config (#6364)	2025-03-20 10:12:37 +01:00
Bassoonian	9a23f19575	19-03-25 master to upcoming merge (#6450)	2025-03-20 09:57:05 +01:00
Alex	adc2c61fe8	Unifies dynamic move category checks (#6443)	2025-03-19 23:06:08 +01:00
AlexOn1ine	3c632b8b44	19-03-25 master to upcoming merge	2025-03-19 17:12:47 +01:00
Alex	4c4d043c13	Refactor the function IsAbilityPreventingEscape (#6439) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-03-19 16:09:36 +01:00
PhallenTree	cf9ee2caee	Fixes Toxic Spikes Absorbed message (#6448)	2025-03-19 13:46:23 +01:00
Pawkkie	411a236ce7	Fix AI using Scald / fire moves against frozen / frostbitten targets (#6442)	2025-03-19 09:32:59 +01:00
Alex	98a5fab898	Optimization / Clean up of AI move usability (#6332)	2025-03-18 23:42:07 -04:00
Alex	6031bb2a78	Split ai function IsBattlerTrapped (#6438)	2025-03-18 12:00:11 -04:00
Alex	4193963096	Fixes Cotton Spore failing if one of the targets blocks it (#6418) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>	2025-03-18 15:41:37 +01:00
Alex	0db9043c52	Rename absentBattlerFlags to absent (#6432)	2025-03-17 21:51:04 +01:00
Alex	99a3d01877	Fixes dynamax reversion when ejected out + anim fix (#6416) ... Co-authored-by: hedara90 <90hedara@gmail.com>	2025-03-17 19:57:38 +01:00
wiz1989	1e2aa18ffe	Added Dynamax/Gigantamax battle messages (#6440) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-03-17 19:16:43 +01:00
PhallenTree	ddab689a07	Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435)	2025-03-16 23:10:20 +01:00
Deokishisu	eaf7549854	Replace Incorrect Slow Stairs Movement with Correct One (#6275)	2025-03-16 14:51:36 -07:00
khbsd	816ed0d963	Low Health Beeps Configuration (#6328)	2025-03-15 22:02:48 -07:00
GriffinR	04eb22f4ea	Fix offset for towerInterview in BattleFrontier	2025-03-15 17:45:42 -04:00