PhallenTree
|
7722ebf470
|
Fixes Hyperspace Fury not breaking protection (#8999)
|
2026-01-23 22:28:22 +00:00 |
|
FosterProgramming
|
2eef017daf
|
Fix premier ball wrong data size (#8979)
|
2026-01-21 01:19:29 +01:00 |
|
Bassoonian
|
d12929ffbd
|
Pret merge (20th of January, 2026) (#8973)
|
2026-01-20 14:35:55 +01:00 |
|
FosterProgramming
|
298bf85759
|
Fix vivillon icy snow icon (#8970)
|
2026-01-20 13:05:28 +01:00 |
|
Hedara
|
594a4c7ec3
|
Merge commit 'dc077e50d3a2d52964a52ce9a9e81fd99586dd4f' into pret-merge
Conflicts:
.github/workflows/build.yml
asm/macros/battle_script.inc
include/constants/battle_script_commands.h
src/battle_controllers.c
src/battle_script_commands.c
src/data/graphics/battle_environment.h
src/party_menu.c
|
2026-01-19 21:40:27 +01:00 |
|
Frank
|
80db2c6aec
|
Renamed building and stadium palettes to be more accurate
|
2026-01-18 18:19:03 -05:00 |
|
amiosi
|
c6fa900f21
|
Fix Memento and Block regressions (#8942)
|
2026-01-18 18:06:33 +01:00 |
|
amiosi
|
355a6f8221
|
Mega Gardevoir should always be Fairy-type (#8955)
|
2026-01-18 11:09:43 +01:00 |
|
amiosi
|
21a3b5229a
|
Fix Metronome bans (#8834)
|
2026-01-18 09:27:14 +01:00 |
|
amiosi
|
9798b6c7d7
|
Changes to Item icons and palettes (#8614)
|
2026-01-13 15:16:26 +01:00 |
|
Josh Hufford
|
53984af384
|
Fix typo in Salazzle form species ID table reference (#8904)
|
2026-01-13 03:25:24 +01:00 |
|
amiosi
|
0870fe24c7
|
Miscellaneous species_info Changes (#8462)
|
2026-01-11 18:54:43 +01:00 |
|
Eduardo Quezada
|
41038cbc88
|
Fix in-battle form changes always reverting (#8810)
|
2026-01-11 15:33:12 +01:00 |
|
amiosi
|
dc128c608b
|
add the type boost value for gen 3 sea incense (#8826)
|
2026-01-08 11:35:21 +01:00 |
|
amiosi
|
126100c027
|
fix crash damage implementation and incorrect memento generation (#8804)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-01-06 00:18:46 +01:00 |
|
amiosi
|
c506d52d32
|
Miscellaneous fixes to configs and other values (#8662)
|
2026-01-03 17:34:30 +01:00 |
|
amiosi
|
add14d90ff
|
Miscellaneous Item Changes (#8461)
|
2026-01-02 20:31:11 +01:00 |
|
John Cooper McDonald
|
36c28c449a
|
Fix Naclstack and Garganacl shadows (#8698)
|
2025-12-29 12:02:42 +01:00 |
|
PhallenTree
|
0e8f94f380
|
Fixes Kingambit evolution conditions (#8689)
|
2025-12-28 21:27:19 +01:00 |
|
John Cooper McDonald
|
ba679ddc26
|
Fix the game not building with OW_POKEMON_OBJECT_EVENTS disabled (#8654)
|
2025-12-28 10:02:21 +01:00 |
|
PhallenTree
|
b0285152b4
|
Allow Floette Eternal to mega evolve (#8558)
|
2025-12-17 11:53:19 +01:00 |
|
Eduardo Quezada
|
08a5a319bd
|
Fix Lunar Dance not checking PP (#8364)
|
2025-12-14 12:47:01 +01:00 |
|
amiosi
|
bd832bbf50
|
Environment Fixes (#8471)
|
2025-12-09 19:19:45 +01:00 |
|
amiosi
|
7b036b3b56
|
GBA Asset Fixes (#8382)
|
2025-12-07 13:50:06 +01:00 |
|
amiosi
|
328ec9d708
|
Generational Move Changes (#8405)
|
2025-12-06 23:50:58 +01:00 |
|
Alex
|
520c31dc33
|
Add missing breakable flags (#8454)
|
2025-12-06 17:33:31 +01:00 |
|
AlexOn1ine
|
15d9342fe5
|
30/11/25 master to upcoming merge
|
2025-11-30 14:57:50 +01:00 |
|
Eduardo Quezada
|
0611cbe274
|
Restored encourageEncore flag to non-volatile status effects (#8387)
|
2025-11-29 19:26:58 +01:00 |
|
PhallenTree
|
6ccce4342b
|
Update Lash Out description to clarify its effect (#8372)
|
2025-11-29 10:49:29 +01:00 |
|
AlexOn1ine
|
68300e0f9a
|
27/11/25 Master to upcoming merge
|
2025-11-27 13:39:12 +01:00 |
|
moostoet
|
fbc640d692
|
Refactor Beat Up handling for Gen 3/4 defaults, fix crit check, and expand test coverage (#8307)
|
2025-11-25 22:18:51 +01:00 |
|
Alex
|
c2fba193a6
|
Fix Upper Hand failure still activating Protean (#8329)
|
2025-11-23 12:36:28 +01:00 |
|
Eduardo Quezada
|
51a750e61a
|
Finished fixing tests when setting GEN_LATEST to GEN_5 (#8263)
|
2025-11-23 12:04:36 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
FosterProgramming
|
4a69268bd5
|
Make rainbow effect anim change based on side (#8269)
|
2025-11-18 23:31:47 +01:00 |
|
Zimmermann Gyula
|
772abe6e7d
|
Implement GSC berry/apricorn tree functionality. (#7777)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-11-14 20:28:55 +01:00 |
|
Frank DeBlasio
|
ca575f2701
|
Added Gen 6 contest combos (#8251)
|
2025-11-14 18:24:33 +01:00 |
|
Montblanc
|
90c5e1424f
|
Removed extra period in Pokéshi Doll description (#8252)
|
2025-11-14 11:42:51 +01:00 |
|
Frank DeBlasio
|
6d09eb2402
|
Added contest config and cleaned up contest category variables (#8178)
|
2025-11-13 11:29:38 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
Frank DeBlasio
|
625f67be33
|
Fixed Uproar's description and spacing (#8187)
|
2025-11-10 15:56:40 +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 |
|
FosterProgramming
|
c2c0c06a6f
|
Fix gba sprites trying load non existent female versions (#7996)
|
2025-11-08 17:22:47 +01:00 |
|
FosterProgramming
|
232ddb04f4
|
porymap default settings (#8038)
|
2025-11-07 19:41:08 -08:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
PhallenTree
|
cfcce251d0
|
Fix typo in Electrode-Hisui pokedex entry (#8143)
|
2025-11-05 14:49:12 +01:00 |
|
Bassoonian
|
be4ce5901f
|
Fix Kyurem typo in swap move tables (#8139)
|
2025-11-05 14:48:53 +01:00 |
|
Bassoonian
|
473a0aa44d
|
Add Legends Z-A content (#7935)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-11-04 22:25:33 +01:00 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
Eduardo Quezada
|
51a6081c8e
|
Parametrized Ice Face's weather form change (#8115)
|
2025-11-02 20:31:09 +01:00 |
|