305 Commits

Author	SHA1	Message	Date
Hedara	0a876b46ec	Merge branch 'master' into master-to-upcoming ... Conflicts: data/battle_scripts_1.s include/constants/expansion.h src/field_control_avatar.c src/ow_abilities.c	2026-05-02 21:15:57 +02:00
Hedara	6798f72e03	Expansion 1.15.2 release	2026-05-01 21:36:07 +02:00
Hedara	8e11c5b554	Merge branch 'master' into master-merge ... Conflicts: spritesheet_rules.mk src/data/graphics/items.h src/data/graphics/trainers.h src/data/object_events/object_event_graphics.h src/decoration.c src/pokedex_area_region_map.c src/pokemon.c tools/preproc/c_file.cpp tools/preproc/c_file.h	2026-04-30 18:55:19 +02:00
Martin Griffin	2a5dec304c	Merge branch 'pret-master-2283' into rhh-master	2026-04-30 14:20:42 +01:00
Bivurnum	10ae7f9f54	Overworld Encounters (#8434) ... Co-authored-by: HashtagMarky <143505183+HashtagMarky@users.noreply.github.com> Co-authored-by: luuma <31407427+luuma@users.noreply.github.com> Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>	2026-04-29 19:36:14 +02:00
AlexOn1ine	7ff83c6542	23/04/26 Master to upcoming merge	2026-04-23 20:24:23 +02:00
shachar700	f4b3598030	how_to_testing_system.html: Change player species from Oddish to Wobbuffet (#9728)	2026-04-23 18:36:53 +02:00
grintoul	70340c1135	12v12 capability (#8943)	2026-04-07 13:57:29 +02:00
Pawkkie	c17a1f1a7f	Merge remote-tracking branch 'upstream/master' into master-merge-20260406	2026-04-06 11:44:33 -04:00
mudskip	02943cb4fc	feat (shopMenu): conditional item appearances (#9425)	2026-03-31 14:33:35 +02:00
Hedara	fcecfadda6	Expansion 1.15.1 release	2026-03-30 16:03:07 +02:00
Kildemal	bb1961348a	refactor(graphics): make spinda spots generic (#9594)	2026-03-30 12:22:16 +02:00
Kildemal	21b0181bc0	refactor(quickstart): rename hud position config and add parens	2026-03-28 20:47:06 +05:30
Kildemal	69417e9b47	refactor(quickstart): use config for HUD position	2026-03-28 20:43:57 +05:30
Kildemal	03f4c099d7	refactor(quickstart): consolidate frlg/emerald functions	2026-03-28 17:41:23 +05:30
Kildemal	2ca0a25e74	docs(quickstart): add quickstart feature documentation	2026-03-28 13:46:39 +05:30
Bivurnum	74e4e2efe2	Improved FRLG Map Previews (#9557) ... Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>	2026-03-24 22:58:55 +01:00
Hedara	85d3de7561	Merge branch 'master' into master-merge ... Conflicts: docs/tutorials/mon_generation.md src/battle_ai_main.c src/pokemon_sprite_visualizer.c test/battle/ai/ai_switching.c	2026-03-20 22:48:44 +01:00
Kildemal	facd68cc32	docs(tutorials): clean up mon_generation tutorial for readability (#9531)	2026-03-20 11:30:08 +01:00
Marky	35a2ee34bb	Separate Perfect IV Logic Into New Function (#9173)	2026-03-04 00:26:59 +01:00
HunarPG	21be66b174	Add Instructions on how to build FRLG by default (#9415)	2026-03-03 23:57:50 +01:00
hedara90	7cbafaa400	Update changelog (#9397) ... Co-authored-by: Hedara <hedara90@gmail.com>	2026-03-01 10:30:50 -05:00
Hedara	150649546e	Expansion 1.15.0	2026-02-28 22:13:30 +01:00
Hedara	beb9825fef	Merge branch 'upcoming' into expansion-release	2026-02-28 22:00:41 +01:00
Hedara	d6f59caeaf	Expansion 1.14.4	2026-02-28 21:44:20 +01:00
FosterProgramming	0c89094756	Ease vanilla maps deletions (#9199) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>	2026-02-24 10:26:33 -08:00
FosterProgramming	163bf63a39	Update new mon teachable learnset tutorial (#9302) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>	2026-02-23 13:59:58 -08:00
AlexOn1ine	675de8cbea	21/02/26 Master to upcoming merge	2026-02-21 12:55:21 +01:00
Kildemal	ac7e45351d	docs(dns): add nighttime palette user guide (#9158)	2026-02-08 07:34:40 -08:00
Hedara	0c447063e1	Merge branch 'master' into master-merge ... Conflicts: data/battle_anim_scripts.s include/battle_util.h include/constants/expansion.h src/battle_anim_dark.c src/battle_anim_effects_1.c src/battle_anim_normal.c src/battle_hold_effects.c src/battle_script_commands.c src/battle_util.c src/debug.c	2026-02-04 12:46:59 +01:00
Hedara	2d17ad27f9	Expansion 1.14.3 release	2026-02-01 17:13:23 +01:00
Alex	829488e761	Merge branch 'upcoming' into master-merge-3	2026-01-30 12:55:34 +01:00
AlexOn1ine	396c64c22a	30/01/26 Master to upcoming merge	2026-01-30 12:49:21 +01:00
cawtds	ea102b358d	documentation on how to use frlg (#9045)	2026-01-28 13:35:38 -08:00
AlexOn1ine	f8266b828b	26/01/26 Master to upcoming merge	2026-01-26 19:35:43 +01:00
psf	433f55157c	fix: updated rulings about big feature label (#9027)	2026-01-26 13:19:55 -05:00
Eduardo Quezada	89da62b02d	Remove trailing whitespace - Master (#9011)	2026-01-25 10:12:41 +01:00
Pawkkie	74f0e6286b	Amend "SS Item" category of scope doc (#8966)	2026-01-19 14:21:50 -05:00
Eduardo Quezada	4df79828ac	Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge	2026-01-11 15:06:42 -03:00
Eduardo Quezada	41038cbc88	Fix in-battle form changes always reverting (#8810)	2026-01-11 15:33:12 +01:00
FosterProgramming	8ad0451914	Capture odds refactor and new catch rate modifiers (#8682) ... Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>	2026-01-11 09:52:38 +01:00
FosterProgramming	8c9d3b9c7a	Add gym leader support for vs seeker and clean vs seeker code (#8172) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>	2026-01-04 20:03:41 -08:00
FosterProgramming	1dcfe54b59	Refactor mon generation (#8204) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>	2026-01-04 20:01:59 -08:00
grintoul	838d582381	enum TrainerPicID to replace defines for TRAINER_PIC_XXXX and TRAINER_BACK_PIC_XXXX (#8789) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2026-01-03 16:41:11 -08:00
Bassoonian	3755e51a24	Move enum (#8739)	2026-01-03 17:43:48 +01:00
FosterProgramming	b3defd99fc	Add a cleaner way to reset all_learnables.json (#8747)	2026-01-03 17:08:48 +01:00
Hedara	addb11cfa2	Merge branch 'master' into master-to-upcoming ... Conflicts: include/constants/expansion.h src/battle_script_commands.c	2026-01-02 11:49:03 +01:00
Hedara	64d40d3c14	Expansion 1.14.2 release	2026-01-02 10:41:18 +01:00
hedara90	f91b052f7a	01/01/26 Master to upcoming merge (#8731)	2026-01-01 11:59:18 +01:00
AlexOn1ine	a1948b7c40	01/01/26 Master to upcoming merge	2026-01-01 10:24:19 +01:00