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
Hedara
dd17524fc9
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
...
sha1sum changed
Conflicts:
include/global.h
include/overworld.h
include/pokemon.h
src/map_name_popup.c
src/pokedex_area_screen.c
src/pokemon.c
2025-11-01 15:09:20 +01:00
Hedara
a2ef3284dd
Merge branch 'master' into master-to-upcoming
...
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
2025-10-29 18:42:59 +01:00
Alex
dd875b87bc
Combine Simple Beam and Worry Seed into one effect ( #8039 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-29 15:20:12 +01:00
Bassoonian
f7cbe4853b
Add type enum ( #8054 )
2025-10-27 16:41:22 +00:00
Bivurnum
6ddabde582
New Feature: ORAS Dowsing ( #7211 )
2025-10-27 17:41:07 +01:00
Raymond Dodge
95d98305dd
Add camera-facing right-walking Krabby and Kingler follower sprites ( #7881 )
2025-10-26 11:45:40 +01:00
AlexOn1ine
6acabd4ba2
Master to upcoming merge
2025-10-25 16:19:32 +02:00
FosterProgramming
46b122c5ce
Revert HGSS dex and movelist changes ( #8016 )
2025-10-23 13:52:25 +02:00
hedara90
3bb6cddffb
Fix Minior start of battle form ( #7972 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-21 16:39:02 +02:00
FosterProgramming
eac5da89ad
Make movelist calculations happen during compilation instead of runtime ( #7967 )
2025-10-20 15:31:42 +02:00
Alex
786859b6bb
Fix Fling Mental Herb message ( #7984 )
2025-10-19 22:38:27 +02:00
FosterProgramming
fb5f5b8f57
Fix ruination and nature's madness damage percentage ( #7983 )
2025-10-19 20:37:43 +02:00
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values ( #2183 )
...
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.
Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.
Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
2025-10-19 17:37:13 +01:00
hedara90
b03e58e2a1
Fix Persim Berry battle usage ( #7963 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-17 22:57:18 +02:00
AlexOn1ine
e365add4cf
15/10/25 Master to upcoming merge
2025-10-15 21:31:00 +02:00
FosterProgramming
14710eba04
Fix volt tackle not inflicting recoil ( #7944 )
2025-10-13 23:52:21 +02:00
Alex
2daa8f3c88
Remove EffectHitSetTerrain script to use moveeffect ( #7938 )
2025-10-13 15:39:10 +02:00
Alex
eee546df06
Item battle effect refactor ( #7857 )
2025-10-12 08:59:33 +02:00
Alex
dd412c766a
Adds missing breakable flag for Bulletproof ( #7928 )
2025-10-12 08:54:14 +02:00
FosterProgramming
41751451f6
Fix fusion pokemon aquiring illegal movesets ( #7896 )
2025-10-09 15:26:26 +02:00
