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 |
|
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 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
FosterProgramming
|
4d60c9e83f
|
Fix copyvar instead of setvar causing issue with LTO (#8097)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-11-01 16:42:07 +00: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 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-10-23 21:29:33 +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 |
|
AlexOn1ine
|
0eb715de11
|
Add rock climb history from ghoul
|
2025-08-05 20:47:05 +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
|
bc73f4654b
|
merge master 31/07/25
|
2025-08-01 12:18:11 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
AlexOn1ine
|
68db4c5a77
|
12/07/25 master to upcoming merge
|
2025-07-12 11:55:06 +02:00 |
|
Alex
|
0422a013c4
|
Add Set Hidden Nature option to the debug menu (#7281)
|
2025-07-07 13:33:57 -04:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
Bivurnum
|
c6221fa50e
|
Add debug options for follower NPCs (#7215)
|
2025-06-25 21:13:43 +02:00 |
|
Hedara
|
150091990d
|
Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge
|
2025-06-25 17:14:52 +02:00 |
|
Hedara
|
51a5577f65
|
Merge branch 'master' into master-upcoming
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
|
2025-06-25 14:17:07 +02:00 |
|
Ariel A
|
07fd8a28fb
|
fix: hide followers when player enters Battle Pike curtains
|
2025-06-24 20:16:04 -04:00 |
|
Hedara
|
726f18f360
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
|
2025-06-24 10:42:24 +02:00 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -04:00 |
|
cawtds
|
21499cbee1
|
Refactor field moves (#6660)
|
2025-05-31 09:03:12 +02:00 |
|
Bivurnum
|
f2a3226b47
|
Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010)
|
2025-05-29 11:05:23 +02:00 |
|