luuma
|
6898b3ce10
|
Adds HM users to cheat start (#10781)
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 / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
|
2026-09-12 19:34:57 +02:00 |
|
AlexOn1ine
|
21958737f0
|
09/06/26 Master to upcoming merge
|
2026-08-09 17:52:26 +02:00 |
|
PCG06
|
f74eb38443
|
30/07/26 master to upcoming merge
|
2026-07-30 16:28:08 +05:30 |
|
Hedara
|
c852954af5
|
Merge commit 'a545d575efd541e8885cef072ace01c8a9684584' into pret-merge
Conflicts:
include/fieldmap.h
include/menu.h
include/text.h
src/battle_controller_player.c
src/battle_gfx_sfx_util.c
src/battle_pyramid.c
src/fieldmap.c
src/item_use.c
src/menu.c
src/text.c
|
2026-07-29 13:33:06 +02:00 |
|
agsmgmaster64
|
60c9b83a8a
|
Fix FRLG Trainer Card Setup (#10527)
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
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
|
2026-07-28 21:50:55 +02:00 |
|
Ruby
|
8b6885ecec
|
Cleanup debug.inc (#10469)
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
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2026-07-21 09:21:07 +02:00 |
|
AlexOn1ine
|
5340d262a4
|
15/07/26 master to upcoming merge
|
2026-07-15 08:15:00 +02:00 |
|
GGbond
|
6565dc525f
|
Fix debug time scripts leaving followers frozen (#10382)
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-05 22:48:12 +02:00 |
|
Ruby
|
662421c922
|
Dynamic Multichoice Tutorial (#10199)
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 |
|
Martin Griffin
|
5ab619eba2
|
Merge remote-tracking branch 'rhh/master' into upcoming
|
2026-06-07 08:05:52 +01:00 |
|
FosterProgramming
|
caa0bc470a
|
Rework egg creation and hatching mechanisms (#9878)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2026-06-06 21:18:45 +02:00 |
|
Salem
|
7266185199
|
Dynamic trainerbattle Scripts (#8678)
Co-authored-by: Your Name <you@example.com>
|
2026-06-06 18:17:02 +02:00 |
|
FosterProgramming
|
4b6a69ae24
|
Rename daycare special to account for string side effects (#2287)
|
2026-06-04 12:08:01 +01:00 |
|
Martin Griffin
|
06cfcb652c
|
Merge remote-tracking branch 'pret/master' into rhh-master
|
2026-06-01 20:08:44 +01:00 |
|
Martin Griffin
|
a7cfa0ddd5
|
Cleanup 'message 0x0' (#10110)
|
2026-06-01 20:42:09 +02:00 |
|
Viperio
|
e7c30866ef
|
Fix colosseum warps frlg (#10100)
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-31 11:20:40 +02:00 |
|
FosterProgramming
|
7b5f3c6b06
|
Mass outbreak (#9927)
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-30 08:58:52 +02:00 |
|
AlexOn1ine
|
c5d7936784
|
Merge remote-tracking branch 'rhh/master' into master-merge-12
|
2026-05-29 19:56:45 +02:00 |
|
Martin Griffin
|
62a8d64031
|
Remove implicit waitstates from FireRed
|
2026-05-27 09:17:09 +01:00 |
|
Hedara
|
b725ccc672
|
Merge branch 'master' into master-merge
Conflicts:
asm/macros/battle_anim_script.inc
data/battle_anim_scripts.s
data/battle_scripts_1.s
data/event_scripts.s
data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
src/battle_move_resolution.c
src/battle_util.c
src/field_control_avatar.c
src/pokemon_size_record.c
src/pokenav_match_call_data.c
tools/preproc/c_file.cpp
|
2026-05-17 18:10:59 +02:00 |
|
Hedara
|
2844633403
|
Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge
Conflicts:
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
data/maps/BattleFrontier_Lounge1/scripts.inc
data/maps/BattleFrontier_Lounge5/scripts.inc
data/maps/BattleFrontier_Lounge6/scripts.inc
data/maps/BattleFrontier_Lounge7/scripts.inc
data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
data/maps/FortreeCity_House1/scripts.inc
data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/maps/PacifidlogTown_House3/scripts.inc
data/maps/RustboroCity_House1/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
data/maps/SlateportCity_NameRatersHouse/scripts.inc
data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
data/scripts/day_care.inc
data/scripts/pc_transfer.inc
data/specials.inc
|
2026-05-15 16:40:56 +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 |
|
FosterProgramming
|
57f3f4a0b6
|
Safari fixes (#9882)
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-01 16:46:02 +02: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 |
|
Martin Griffin
|
89ca861a3a
|
Merge pull request #2200 from mrgriffin/pret-implicit-waitstate
Implicit waitstate for special/specialvars
|
2026-04-21 15:54:10 +01:00 |
|
AlexOn1ine
|
679b0930b3
|
Master to upcoming merge 14/04/26
|
2026-04-14 20:14:27 +02:00 |
|
Marky
|
15f00c8dbd
|
Allow STR_VAR_# arguments in bufferlivemonnickname (#9752)
|
2026-04-11 10:55:28 +01:00 |
|
FosterProgramming
|
780805f169
|
Move relearner refactor (#9006)
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-06 11:18:15 -07: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)
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 |
|
BluSunrize
|
130600ef46
|
Fix timing and structure of Apricorn Tree messages (#9650)
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-29 20:10:55 +02:00 |
|
Nephrite
|
47cac73a61
|
gBerries refactor + untangling berry indices from item IDs (#7305)
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 |
|
FosterProgramming
|
77fa8e086b
|
Version specific tweaks of post whiteout script (#9521)
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: Bassoonian <iasperbassoonian@gmail.com>
|
2026-03-16 13:17:35 +01:00 |
|
Bassoonian
|
310f746565
|
Fix space indentation in .s and .inc files (#9371)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-02-27 12:45:00 -08:00 |
|
cawtds
|
97e83ebe6a
|
Add FRLG (#7423)
|
2026-01-28 17:41:12 +01:00 |
|
FosterProgramming
|
fe2c154b89
|
Refactor chooseboxmon (#8491)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-01-22 19:54:19 +01:00 |
|
FosterProgramming
|
550fe9a7de
|
Refactor pokerus and add configs (#7731)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2026-01-14 12:04:33 +01:00 |
|
Frank DeBlasio
|
667ae0cc70
|
Migrated some strings out of strings.c/strings.h (#8270)
|
2026-01-02 23:48:00 -08:00 |
|
Eduardo Quezada
|
15b2544e9f
|
Fixed Wally Tutorial and added option to check from Debug Menu (#8502)
|
2025-12-14 00:34:12 -05:00 |
|
Paccy
|
47e1ca999a
|
Add Chooseboxmon special (#5428)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-04 22:46:55 +01:00 |
|
Salem
|
29f83ea5e0
|
Trainerbattle Type Differentiation (#6424)
Co-authored-by: CallmeEchoo <callmeechoo@github.com>
Co-authored-by: Your Name <you@example.com>
|
2025-12-01 19:28:09 +01:00 |
|
FosterProgramming
|
d13965fe1f
|
New debug menu actions: Give Egg and Set KO (#8330)
|
2025-12-01 14:49:35 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
AlexOn1ine
|
ba74c076f6
|
pret merge
|
2025-11-16 12:01:13 +01:00 |
|
hedara90
|
f8e7a2db5f
|
Fix incorrect UBFIX checks (#2206)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-16 10:33:16 +00:00 |
|
hedara90
|
61e06cae08
|
Fix Apricorns with OW_SHOW_ITEM_DESCRIPTIONS not off (#8253)
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-14 22:49:47 +01:00 |
|
Zimmermann Gyula
|
772abe6e7d
|
Implement GSC berry/apricorn tree functionality. (#7777)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-11-14 20:28:55 +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 |
|
Martin Griffin
|
1a9fbbcfba
|
Fix copyvar with non-var argument
|
2025-11-06 14:29:09 +01:00 |
|
Martin Griffin
|
400788ddf6
|
Implicit waitstate for special/specialvars
|
2025-11-05 22:38:51 +00:00 |
|