Commit Graph

210 Commits

Author SHA1 Message Date
FosterProgramming
ceb0ce5cb1
Move wild encounter related config to wild_encounter config file (#9879)
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-02 22:08:54 +02:00
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
Kildemal
fab0777918
fix(debug_menu): fix flicker when used when map pop-up active (#9872)
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-05-02 09:52:00 +02:00
Frank DeBlasio
888dcc33d2
Fix spaces, spelling, and grammar (#9761) 2026-04-12 10:22:09 -07: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
Martin Griffin
48a165c403
Support non-contiguous SE/MUS IDs in debug menu (#9713) 2026-04-07 13:56:51 +02:00
Pawkkie
c17a1f1a7f Merge remote-tracking branch 'upstream/master' into master-merge-20260406 2026-04-06 11:44:33 -04:00
Linathan
b51495964d
Fixed debug warping allowing player movement in the middle of warp (#9653) 2026-03-31 10:23:05 +02:00
FosterProgramming
29291bbbb0
Fix issue when looking at invalid value for no bag var in debug menu (#9666) 2026-03-31 10:10:10 +02:00
Eduardo Quezada
9dfe7c4340 Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge20260328 2026-03-28 19:25:08 -03:00
grintoul
04532a0c96
Fixes debug menu Fly Flags toggle (#9607)
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-22 14:22:43 +01:00
Nephrite
47cac73a61
gBerries refactor + untangling berry indices from item IDs (#7305)
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-21 21:30:09 +01:00
Bassoonian
b4c311a308
Add Species enum (#9507)
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: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
2026-03-17 12:47:48 +00:00
FosterProgramming
53c466dd22
Fix battle type doubles for debug battle (#9486)
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-03-09 10:18:11 +00:00
FosterProgramming
87078e355d
Fix free match call compile fail (#9416) 2026-03-04 13:16:37 +01:00
Bassoonian
d7106b7ef1
Regularise switch indentation (#9368) 2026-02-27 15:54:21 +01:00
Bassoonian
de6947a6e5
Fix spacing for conditions (#9369)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-27 15:10:52 +01:00
AlexOn1ine
675de8cbea 21/02/26 Master to upcoming merge 2026-02-21 12:55:21 +01:00
FosterProgramming
3fca2dbb6d
Show ability num instead of ability id whn picking ability with debug givemon (#9225) 2026-02-17 10:50:02 +01:00
cawtds
ae9b313e97
fix id range for object events and multi decrements/increments (#9098) 2026-02-16 15:53:19 +01: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
FosterProgramming
d6aac051fb
Fix debug menu using female icon with male palette (#9092)
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-01-31 08:19:59 +00:00
cawtds
97e83ebe6a
Add FRLG (#7423) 2026-01-28 17:41:12 +01:00
Frank DeBlasio
7b4eb6ce40
Poke Ball consolidation (#8962) 2026-01-20 00:02:34 +01:00
Bassoonian
36fcd9c6b2
Adds `Item` enum (#8897) 2026-01-17 02:26:09 -08:00
FosterProgramming
550fe9a7de
Refactor pokerus and add configs (#7731)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2026-01-14 12:04:33 +01: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
Hedara
82c474bcd0 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/config/battle.h
2026-01-04 17:31:25 +01:00
Bassoonian
eba17e6860
Remove credits from code (#8748) 2026-01-03 18:21:13 +01:00
Bassoonian
3755e51a24
Move enum (#8739) 2026-01-03 17:43:48 +01:00
grintoul
e82ed111ba
Misc style and whitespace cleanup (#8681) 2026-01-02 18:01:43 +01:00
FosterProgramming
e95b4de84e
Add trainers submenu for debug menu (#8399) 2025-12-27 16:57:13 +01:00
hedara90
27ff29fbc5
Fix Debug Menu accessing disabled species (#8683)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-12-27 11:14:49 +01:00
Eduardo Quezada
15b2544e9f
Fixed Wally Tutorial and added option to check from Debug Menu (#8502) 2025-12-14 00:34:12 -05:00
FosterProgramming
d13965fe1f
New debug menu actions: Give Egg and Set KO (#8330) 2025-12-01 14:49:35 +01:00
PCG
d2425c1468
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-11-09 12:54:01 -08:00
Ultimate_Bob
c57bde3c5e
Fix build failing with NOOPT=1 due to discarding static data. (#8053)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-11-05 17:07:05 +01:00
Bassoonian
be23dfdf2a
Even more enums and documentation (#8029) 2025-10-25 14:37:47 +02:00
Estellar
b5b12051bf
Display TM/HM's move name in the debug menu (#7994)
Some checks failed
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2025-10-21 16:33:06 +02:00
Estellar
a5b69a4daf
Give the Coin Case when coins are maxed (#7973)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-10-18 18:57:33 +02:00
AlexOn1ine
e365add4cf 15/10/25 Master to upcoming merge 2025-10-15 21:31:00 +02:00
Marky
daedfd5e62
Add gBallItemIds Array (#7905) 2025-10-10 11:09:19 +02:00
cawtds
b0b92532ff
Fix EV display in debug menu (#7848) 2025-10-07 23:17:44 +02:00
AlexOn1ine
870b93aad9 06/10/25 Master to upcoming merge 2025-10-06 19:42:42 +02:00
FosterProgramming
730352683c
Add new actions to Debug Menu (#7837) 2025-10-03 20:26:49 +02:00
FosterProgramming
2156651313
No bag use flag changed to a varable (#7780)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-01 14:51:09 +02:00
Eduardo Quezada
2c80b9124b
Fix Debug Give Pokémon (Complex) with duplicate moves (#7821) 2025-09-29 23:05:13 +02:00
khbsd
e385c7f59f
feat: change defines in constants/abilities.h to an enum (#7006)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-29 21:35:09 +02:00
Frank DeBlasio
c9ec896312
Refactor battle environment (#4891) 2025-07-12 12:38:06 -04:00
Eduardo Quezada
b5a13d5e7f
Fixed Flag Vars menu keeping artifacts from bag menu + cleanup (#7226) 2025-07-08 22:00:37 +02:00