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
Frank DeBlasio
6445e1863a
Updated Mountain Gale's PP for Gen 9 ( #7856 )
2025-10-07 17:19:04 +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
Eduardo Quezada
f9a8a0251a
Added regional form evolution condition ( #6990 )
2025-09-25 19:16:33 +02:00
Frank DeBlasio
db3405dc3a
Added COMPOUND_STRINGs to region_map_entries.h ( #7669 )
2025-09-20 11:18:55 +02:00
AlexOn1ine
bc84e6656d
Master to upcoming merge
2025-09-17 20:18:51 +02:00
Alex
f671b130a6
Fixes Beat Up incorrect slots usage ( #7741 )
2025-09-17 11:40:40 +02:00
Alex
74de29a921
Bugfixes Batch ( #7739 )
2025-09-16 19:44:06 +02:00
Alex
32f8464fec
Attackcanceller fixes and improvements ( #7698 )
2025-09-16 18:00:30 +02:00
mudskipper13
59a214828e
Implement field_name_box ( #7697 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-14 20:45:18 +02:00
hedara90
3c94074750
Add pool rules for Mega Stones and Z-Crystals ( #7720 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-09-12 21:04:36 +02:00
Alex
05ed9f0d39
Remove Uproar attack battle script ( #7715 )
2025-09-10 22:07:43 +02:00
Hedara
1ec08fbe0d
Merge branch 'master' into master-to-upcoming
2025-09-06 19:43:43 +02:00
Alex
0422340356
Refactors Attackstring and PP deduction ( #7402 )
2025-09-03 20:25:27 +02:00
Eduardo Quezada
f39fdf57cf
Fixed disabled cross-evolutions still being possible ( #7678 )
2025-09-02 15:46:48 +02:00
Frank DeBlasio
674cd13659
Added sortType to Douse Drive ( #7664 )
2025-08-31 20:53:23 +02:00
AlexOn1ine
1131b205f2
conflicts
2025-08-28 14:09:38 +02:00
RavePossum
2fbf45d057
Restore X item friendship increase ( #7583 )
2025-08-26 22:17:30 +02:00
AlexOn1ine
ce52d83343
25/08/25 Master merge
2025-08-25 17:30:38 +02:00
grintoul
888783aaa5
Restore AI: Basic Trainer to PARTNER_STEVEN ( #7586 )
2025-08-20 10:22:19 -04:00
