141 Commits

Author SHA1 Message Date
Ruby
662421c922 Dynamic Multichoice Tutorial (#10199)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-07-03 14:54:11 +02:00
hedara90
f284e5e589 Update how to pokemon (#10353)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-07-01 08:37:36 +02:00
Ruby
6233cf8cb6 Changes to mapjson.cpp and how_to_frlg.md (#10198)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-06-13 21:32:33 +02:00
Ruby
1b920b67b6 Fix Trainer Party Pool documentation (#10122) 2026-06-02 12:38:33 +02:00
AlexOn1ine
7e0c2d430e 28//05/26 Master to upcoming merge 2026-05-28 10:47:55 +02:00
psf
da55761d03 updated DNS tutorial to be more clear (#10067)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2026-05-27 13:16:48 -04:00
grintoul
0c35f03f31 Adds deprecation warnings to old party and party count globals (#9885)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-05-27 06:24:53 +01:00
jtebbe
836d645edc Random Mon Generation (#9896)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-05-12 08:40:13 +02:00
jtebbe
2ca70ac4e1 Add Dynamic Weather Option (#9877) 2026-05-08 21:50:22 +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)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-04-07 13:57:29 +02:00
mudskip
02943cb4fc feat (shopMenu): conditional item appearances (#9425)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-31 14:33:35 +02:00
Kildemal
bb1961348a refactor(graphics): make spinda spots generic (#9594)
Some checks failed
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
CI / build (push) Has been cancelled
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)
Some checks are pending
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
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
FosterProgramming
0c89094756 Ease vanilla maps deletions (#9199)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
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)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
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)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-02-08 07:34:40 -08: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
Eduardo Quezada
89da62b02d Remove trailing whitespace - Master (#9011) 2026-01-25 10:12:41 +01: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
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
Pawkkie
39c142a879 Add AI_FLAG_RANDOMIZE_PARTY_INDICES (#8717) 2025-12-31 22:56:22 +01:00
FosterProgramming
30e5fc6958 Refactoring the way teachable learnsets are generated (#8027) 2025-12-26 13:13:29 +01:00
Pawkkie
0551fcf408 Add Dynamic Switch AI Function (#8629) 2025-12-25 02:02:01 +01:00
Eduardo Quezada
9451af1c64 B_UPDATED_CONVERSION_2 config tests (#8573)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-12-19 16:17:24 +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
Alex
71a1967b7b Move target type refactor (#8513) 2025-12-18 13:12:41 +01:00
hedara90
ec1a283b1b Add SUB_HIT check to tests (#8413)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-12-16 19:19:34 +01:00