Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,888 Commits 1 Branch 0 Tags
Commit Graph

8452 Commits

Author SHA1 Message Date
LOuroboros
446bcd3181 Merge branch 'master' of https://github.com/pret/pokeemerald into pePret 2022-04-11 01:23:18 -03:00
LOuroboros
eb1834ce84 Merge branch 'master' of https://github.com/pret/pokeemerald into iePret 2022-04-11 01:22:48 -03:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
Eduardo Quezada D'Ottone
17f5f96f74 Added Pokémon Jump data. 2022-04-10 15:45:23 -04:00
Eduardo Quezada D'Ottone
5fc72c2bfe Heights and weights in Pokédex Orders lists 2022-04-09 22:40:36 -04:00
garakmon
3fe423a6f4 use json for region map sections 
- update nlohmann/json and pantor/inja in tools/
  - create new inja template
 2022-04-04 23:32:03 -04:00
Eduardo Quezada D'Ottone
454068095c Moved Sky Drop battle string to where other battle strings are 2022-04-04 16:59:01 -04:00
Eduardo Quezada D'Ottone
d604d99d6e Adjusted description of Glacial Lance and Astral Barrage 2022-04-03 16:54:07 -04:00
LOuroboros
3ca9ac5b37 Post merge corrections 2022-04-03 14:27:33 -03:00
Eduardo Quezada D'Ottone
dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
00e0eefe09 Document trainer hill prize selection 2022-04-01 01:37:48 -04:00
GriffinR
328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00
GriffinR
62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
GriffinR
66cbe29c14 Add bugfix for Battle Factory trainer IVs 2022-03-30 09:37:03 -04:00
LOuroboros
a127cb32bb Removed pointless use of preproc directives 2022-03-30 02:05:54 -03:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
BuffelSaft
4b769901bc
Merge pull request #2059 from AsparagusEduardo/BE_SandForce 
Remove repeated ability check in battle_ai_util.c
 2022-03-26 15:40:47 +13:00
ExpoSeed
5fd468f507 Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns 2022-03-22 13:10:24 -05:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
LOuroboros
0a65fd316c Fixed Enigma Berry check in CanMegaEvolve 2022-03-20 12:21:15 -03:00
TheXaman
192969c492 small fix 2022-03-18 20:47:12 +01:00
ghoulslash
0036a4dc36 pc acccess 2022-03-18 13:30:08 -04:00
LOuroboros
315813d186 Update debug.c 2022-03-16 10:39:59 -03:00
GriffinR
5160520639
Merge pull request #1642 from GriffinRichards/bstrings 
Add usage of battle strings table offset constant
 2022-03-14 16:40:54 -04:00
GriffinR
33c05cefe2
Merge pull request #1644 from GriffinRichards/name-jump-long-grass 
Name unknown_16.png
 2022-03-14 16:32:08 -04:00
GriffinR
058783c148 Fix comment mistake 2022-03-14 16:01:17 -04:00
GriffinR
0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
Eduardo Quezada D'Ottone
c00873cbc4
Merge pull request #2073 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2022-03-13 18:15:45 -03:00
cbt6
3cc21a0fc8 Format object event graphics info 2022-03-13 05:19:16 +08:00
GriffinR
ce227aa055
Merge pull request #1640 from GriffinRichards/doc-egg-hatch 
Improve egg hatch documentation
 2022-03-12 09:41:14 -05:00
GriffinR
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
SubzeroEclipse
d3589103b3 Fixed some move descriptions 2022-03-09 15:23:08 +01:00
ghoulslash
f53de6ae87 fix toxic/flame orb. use CanBeX'ed functions 2022-03-08 15:16:17 -05:00
Eduardo Quezada D'Ottone
e088552398 Fixed going out of bounds when choosing a move for detailed Give Mon 2022-03-07 21:17:31 -03:00
GriffinR
b1d61b9227
Merge pull request #1641 from GriffinRichards/subsprite-arr-count 
Use ARRAY_COUNT for obj event subsprite tables
 2022-03-03 23:08:52 -05:00
GriffinR
f78f46a1e2 Use ARRAY_COUNT for obj event subsprite tables 2022-03-03 14:54:05 -05:00
GriffinR
8bf7e7b6f5 Improve egg hatch documentation 2022-03-03 01:33:49 -05:00
ultima-soul
2d3ba500c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
GriffinR
a2ee0c8393
Merge pull request #1639 from GriffinRichards/typo-hoppy 
Fix bunny hoppy typo
 2022-02-28 22:34:24 -05:00
GriffinR
5d58cdd297 Fix bunny hoppy typo 2022-02-28 13:34:39 -05:00
GriffinR
2142ad96d5
Merge pull request #1638 from GriffinRichards/menu-arr-count 
Add missing menu array counts
 2022-02-28 01:49:09 -05:00
GriffinR
3d0663fe81 Additional trader clean up 2022-02-27 13:58:48 -05:00
GriffinR
36e5d5e759 Add missing menu array counts 2022-02-27 13:47:50 -05:00
Eduardo Quezada D'Ottone
054f667446 Config for Kadabra ignoring Everstone upon evolving 2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone
ed1ea69759 Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone 2022-02-26 21:40:20 -03:00