1339 Commits

Author	SHA1	Message	Date
AlexOn1ine	a1948b7c40	01/01/26 Master to upcoming merge	2026-01-01 10:24:19 +01:00
amiosi	9d62b2327f	Add Gba-style Substitute (#8655)	2025-12-24 20:56:25 +01:00
artsquirrelb	1e0e1ffca6	Expansion OW sprites fix (#8633)	2025-12-24 15:56:17 +01:00
artsquirrelb	58d0143115	Redraw Gurdurr's overworld sprite (#8625)	2025-12-23 09:22:57 +01:00
Hedara	e4ae9317c9	Merge branch 'master' into master-to-upcoming ... Manual fixes to Lunar Dance handling Conflicts: include/battle_util.h src/battle_ai_main.c src/battle_ai_switch.c src/battle_ai_util.c src/battle_end_turn.c src/battle_script_commands.c src/battle_util.c test/battle/ai/ai_doubles.c test/battle/move_effect/snatch.c test/battle/spread_moves.c	2025-12-19 15:31:37 +01:00
Martin Griffin	35255475cb	Use assertf to detect errors	2025-12-17 18:52:02 +00:00
Martin Griffin	cc8c8bd668	assertf: Formatted asserts ... assertf's behavior depends on the build: - In release builds it executes recovery code. - In debug builds it shows a crash screen. When start is pressed it resumes and executes the recovery code. - In test builds it fails the test with an INVALID result.	2025-12-17 17:14:34 +00:00
hedara90	773ca1fde8	Add support for species unique eggs (#8557)	2025-12-17 16:10:02 +01:00
DaniRainbow	c5b8c9d471	Re-colored Gliscor's anim_front.png (#8341)	2025-12-15 18:51:39 +01:00
Estellar	087f2fba74	Fix Flabébé and Floette overworld sprites (#8511)	2025-12-13 17:06:04 +01:00
AlexOn1ine	23cefec579	08/12/25 master to upcoming merge	2025-12-08 18:15:19 +01:00
amiosi	7b036b3b56	GBA Asset Fixes (#8382)	2025-12-07 13:50:06 +01:00
Eva	d089e4ac3e	OW mon fixes (#8444)	2025-12-06 21:30:53 +01:00
AlexOn1ine	6a28506ee2	19/11/25 Master to upcoming merge	2025-11-19 18:20:30 +01:00
FosterProgramming	4a69268bd5	Make rainbow effect anim change based on side (#8269)	2025-11-18 23:31:47 +01:00
Montblanc	7c046eb3b8	Fixed bKGD for last_used_ball_r_cycle.png (#8261)	2025-11-16 12:52:07 +01:00
Zimmermann Gyula	772abe6e7d	Implement GSC berry/apricorn tree functionality. (#7777) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-11-14 20:28:55 +01:00
Estellar	2e8545ba45	Fix some followers sprites (#8208)	2025-11-11 14:00:12 +01:00
Hedara	b0ccddac69	Merge branch 'master' into master-to-upcoming ... Conflicts: include/constants/expansion.h	2025-11-03 11:11:07 +01:00
Hedara	5c31b58b81	Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge ... Conflicts: spritesheet_rules.mk tools/mapjson/mapjson.cpp	2025-11-01 15:13:16 +01:00
Hedara	a2ef3284dd	Merge branch 'master' into master-to-upcoming ... Conflicts: data/battle_scripts_1.s include/battle_util.h include/constants/battle.h src/battle_script_commands.c src/battle_util.c	2025-10-29 18:42:59 +01:00
Bivurnum	6ddabde582	New Feature: ORAS Dowsing (#7211)	2025-10-27 17:41:07 +01:00
Raymond Dodge	95d98305dd	Add camera-facing right-walking Krabby and Kingler follower sprites (#7881)	2025-10-26 11:45:40 +01:00
AlexOn1ine	6acabd4ba2	Master to upcoming merge	2025-10-25 16:19:32 +02:00
Josh	fa5ca10b17	Add spritesheet rules for healthbox graphics (#2180)	2025-10-19 18:32:19 +01:00
hedara90	358f3211ca	Fix nicknames containing many / overflowing the party screen textbox (#7970) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-10-17 20:17:35 +02:00
AlexOn1ine	e365add4cf	15/10/25 Master to upcoming merge	2025-10-15 21:31:00 +02:00
FosterProgramming	d84d5cb0d4	Fix pikachu starter icon (#7879)	2025-10-08 10:36:30 +02:00
Eva	4822d94667	Nickit & Thievul visual revamp (#7689)	2025-09-16 13:04:17 +02:00
mudskipper13	59a214828e	Implement field_name_box (#7697) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-09-14 20:45:18 +02:00
pokesidv	4d31693005	Rock climb by ghoulslash (#7432) ... Co-authored-by: Evan <eroelke@gmail.com> Co-authored-by: Jaizu <jaizu85@gmail.com> Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-08-03 14:52:07 +02:00
AlexOn1ine	68db4c5a77	12/07/25 master to upcoming merge	2025-07-12 11:55:06 +02:00
Linathan	9228826ae1	New and polished battle animations (#7074)	2025-07-11 19:14:19 +02:00
Phantonomy	809379797e	Better Hydrapple Backsprite (Adapted from DegelAlex on deviantart (#7246)	2025-07-10 23:43:43 -04:00
mudskipper13	0d09e5cce8	battle_interface: overhaul ability pop up (#7227)	2025-07-10 19:09:52 +02:00
wiz1989	e63ac48de2	added Ash Greninja overworld sprites (#6976)	2025-06-07 09:57:43 +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
kittenchilly	75f6d85582	Improve a few Gen 9 Pokemon sprites (#6885)	2025-05-17 19:48:44 +02:00
AlexOn1ine	33607529cd	conflicts	2025-05-16 10:46:32 +02:00
kittenchilly	7359d234c8	PokeCommunity sprites batch (April 2025) (#6840)	2025-05-16 09:35:30 +02: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
Cafe	b451bc3606	New Lurantis animation (#6725)	2025-04-30 12:45:29 +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
GriffinR	f11bddf854	Fixes for Mirage Tower graphics (#2120) ... * Add documentation for CreateCeilingCrumbleSprites * Combine mirage tower graphics * Add comment about mirage tower / player palette	2025-04-14 08:12:45 +02:00
GriffinR	709cfa1c9a	Merge pull request #2014 from Bassoonian/battleterrain ... Rename battle terrain to environment	2025-04-13 19:32:06 -04:00
Hedara	348f5967ac	Remove Ampharos .pla files	2025-04-12 16:35:45 +02:00
Hedara	9afd8800f3	Merge branch 'upcoming' into merrps-dns	2025-04-12 16:33:02 +02:00
agsmgmaster64	1344d8e9dd	Type Effectiveness Indicators when selecting moves (#6559)	2025-04-12 01:03:45 +02:00
Hedara	08a2ad2c98	Merge branch 'upcoming' into merrps-dns	2025-04-09 10:01:51 +02:00
SundayMoonday	bbe8bbc45b	Replaced Blue Sky background for Rock Field (#6516)	2025-04-07 11:04:21 +02:00