atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7408 commits 2 branches 40 tags 600 MiB
Commit graph

668 commits

Author SHA1 Message Date
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
357c5439f5 Document some credits 2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
LOuroboros
dea69a48ef Decapped nature names 2021-03-18 08:31:38 -03:00
Blackforest92
badf8945d8 Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie 2021-03-14 18:31:24 +07:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
ExpoSeed
dd73d8fc06 Fix wrong comment 2021-03-03 16:47:31 -06:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
ExpoSeed
aac7028703 Add newline at end of file 2021-03-02 14:21:29 -06:00
ExpoSeed
6db5a98ad9 Delete old form change table 2021-03-02 14:20:39 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
amiosi
d7d8c62753 restore and add noFlip values 
sources: vanilla emerald, pokediamond, hgss/bw2 overworlds, oras/usum menu sprites.
missing: bw2 & oras data
 2021-02-22 16:04:55 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
amiosi
11e6298a05 tmhm and tutor spacing 2021-02-03 15:08:53 -05:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species 
plus reorder kyurem forms to match the rest of the repo
 2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
amiosi
dba1383d55 Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap 2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute 
Fixed Keldeo Resolute's animation
 2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys 
Fixed Deoxys Attack Form's animation
 2021-02-02 11:17:25 -06:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-02-02 09:48:21 -07:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd 
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
 2021-02-01 21:04:00 -05:00
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
amiosi
102285d464 mons/moves 2021-02-01 14:37:48 -05:00
amiosi
35f3cdd2f2 decap POKeMON string 2021-02-01 14:19:24 -05:00
amiosi
fe3419fa21 Update level_up_learnsets.h 2021-01-29 15:51:53 -05:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05:00
ExpoSeed
34c6771e94 Create form change table 2021-01-27 16:30:43 -06:00
LOuroboros
6e89f8dff2 Corrected Riolu's evo method 2021-01-27 19:02:37 -03:00
LOuroboros
cfa6fc5eb8 Fixed Keldeo Resolute's animation 2021-01-27 15:26:39 -03:00
LOuroboros
99c7797dc8 Fixed Deoxys Attack Form's animation 2021-01-27 15:06:49 -03:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
ExpoSeed
2e0b02e491
Merge pull request #1322 from amiosi/pokemon_expansion 
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
 2021-01-21 19:16:59 -06:00
amiosi
08eb883939 sounds like a lot of HOOPA 2021-01-21 20:10:38 -05:00
ghoulslash
32cc04c91c
Merge pull request #1311 from ultima-soul/deoxys_handling_removal 
Remove Special Handling for Deoxys
 2021-01-21 12:22:03 -07:00
ghoulslash
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe 
Add Form Species ID Tables
 2021-01-20 13:54:20 -07:00
ultima-soul
fdc6156f83 Add Form Species ID tables and entries for new mons and forms. 2021-01-20 12:07:29 -08:00
ultima-soul
9663ed0d3c Merge branch 'form_species_tables' into form_species_tables_pe 2021-01-20 12:06:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
ultima-soul
feecb8b923
Merge pull request #1331 from amiosi/alola 
fix alolan form movesets
 2021-01-19 17:07:03 -08:00
amiosi
be1390e7ae renames 2021-01-19 20:03:35 -05:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
8e06d5679c Index gBardSoundsTable 2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d Array count for easy chat word groups 2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a Index sTMHMMoves 2021-01-14 03:41:28 -05:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08:00
ultima-soul
3cb09b6507 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal 2021-01-11 15:19:11 -08:00
Philipp AUER
b5fa0129d5 [pokemon-expansion] Changes as requested by code review 
Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 21:43:00 +01:00
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01:00
ultima-soul
767f26b73c Corrected defines for Item Expansion-introduced items for Gen 8 species data. 2021-01-08 19:06:20 -08:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
amiosi
25e7f36ce9 fix reversed names 2021-01-04 22:12:03 -05:00
amiosi
c83c09fc3a tabs -> spaces 2021-01-04 22:09:09 -05:00
amiosi
24be2c8c39 fix alolan form movesets 2021-01-04 22:04:51 -05:00
GriffinR
0ca76fc179 Some decoration labels, use constant for tileset size 2021-01-04 16:27:57 -06:00
GriffinR
039108284d Clean up gDecorations with gItems format 2021-01-04 16:27:57 -06:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
LOuroboros
32cb306b85
Tweaked evolution.h 
Litleo doesn't need to have 2 different evolutions into Pyroar.
 2020-12-27 00:10:14 -03:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08:00
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags 
Add Galarian Form mon flags
 2020-12-21 10:05:19 -07:00
ghoulslash
a1e3700d10
Merge pull request #1299 from LOuroboros/cacophony 
Cacophony
 2020-12-21 09:47:52 -07:00
ExpoSeed
ef6a7fbf43 Add Galarian Form mon flags 2020-12-18 18:25:24 -06:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms 
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
 2020-12-18 08:17:49 -03:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
LOuroboros
77871c5eda Dealt with Cacophony 
By copy-pasting back in the BE's include/constants/abilities.h and commenting out the 2 instances where ABILITY_CACOPHONY is normally used in this branch.
 2020-12-14 16:26:00 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags 
Add mon flags
 2020-12-03 15:07:17 -05:00
GriffinR
076b2c2edc Designated initializers for gTrainerBackPicTable 2020-11-30 15:32:08 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
LOuroboros
1083130125 Another one 
Made Crabrawler evolve in the Ice Room of the Shoal Cave too.
 2020-11-25 10:42:57 -03:00
ExpoSeed
3adf316574 Add mon flags 2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e A few more evo related changes. 
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
 2020-11-25 01:15:19 -03:00
LOuroboros
d817950fb6 Readded the EVO_MAP based Eevee->Leafeon and Eevee->Glaceon evos 2020-11-24 23:49:18 -03:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
LOuroboros
210cfabe4c Another one 
In SwSh, Magneton can evolve with a Thunder Stone just like Charjabug
 2020-11-23 11:02:23 -03:00
LOuroboros
e6f44328a1 Commented out parameters 2020-11-23 10:49:32 -03:00
LOuroboros
bb75b1ad17
A few evolution updates 
- Changed the Eevee->Leafeon evo method from EVO_MAP to EVO_ITEM, which is more accurate in comparison as of Gen. 8 since we still don't have the actual evo method implemented.
- Changed the Eevee->Glaceon evo method for the same reason.
- Added Vikavolt's Thunder Stone based evolution as a second option.
 2020-11-23 10:45:00 -03:00
Eduardo Quezada D'Ottone
14bc55007b
Merge pull request #1226 from ExpoSeed/PE-ifdef-items 
ifdef items in base_stats.h and uncomment vanilla hold items
 2020-11-17 11:29:42 -03:00
LOuroboros
1f33a030ac Fixed the pal. of Nu-Arceus' Fighting and Flying forms 2020-11-16 22:05:43 -03:00
ExpoSeed
4db1f02154 Remove ifdefs for vanilla items 2020-11-16 18:58:11 -06:00
LOuroboros
ae4525d170 Fixed the pal. of Arceus' Fighting and Flying forms 2020-11-16 18:39:49 -03:00
ExpoSeed
c8e3104adc ifdef items in base_stats.h 2020-11-15 11:46:38 -06:00
Eduardo Quezada D'Ottone
afeb0c5ae4 Fixed Greninja form species names. 2020-11-14 09:10:16 -03:00
Eduardo Quezada D'Ottone
54630ff5a9 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/evolution.h
 2020-11-13 16:40:31 -03:00
Eduardo Quezada D'Ottone
3981720343 Review changes 4 2020-11-13 16:36:31 -03:00
Eduardo Quezada D'Ottone
d3a5921122 Review changes 3 2020-11-13 16:34:53 -03:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
26db02e95a Review changes 1 2020-11-13 15:36:36 -03:00
LOuroboros
47c0a38401 Added Rayquaza's Mega Evolution to the list of evolutions 2020-11-11 15:19:56 -03:00
Eduardo Quezada D'Ottone
dbd02d1857 Fixed defines. 2020-11-10 20:05:01 -03:00
Eduardo Quezada D'Ottone
caf6253ba3 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon_icon.c
 2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
d97932c009 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon.c
 2020-11-10 19:29:50 -03:00
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences 
Support for Gender Differences
 2020-11-10 12:31:03 -07:00
Eduardo Quezada D'Ottone
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
ed34e90848 Fixed new-line at EOF 2020-11-06 18:08:45 -03:00
Eduardo Quezada D'Ottone
d7fbaa6cbf Support for gender palettes. 2020-11-06 17:12:57 -03:00
Eduardo Quezada D'Ottone
3849f7dd5d Female Eevee backsprite. 2020-11-06 16:45:25 -03:00
Eduardo Quezada D'Ottone
4d4b111327 Front pic gender differences for Eevee 2020-11-06 16:21:45 -03:00
Eduardo Quezada D'Ottone
b494b6e987 Fixing Litleo's and Pyroar's gender ratio. 2020-11-06 14:28:10 -03:00
Eduardo Quezada D'Ottone
6cb73c1e8a
Fixed Trapinch's evolutions abilities. (#555) from AsparagusEduardo 
Fixed Trapinch's evolutions abilities.
 2020-11-04 18:23:15 -03:00
Eduardo Quezada D'Ottone
0c6dc6abab Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	graphics/pokemon/burmy/footprint.png
#	graphics/pokemon/gastrodon/footprint.png
#	graphics/pokemon/rotom/footprint.png
#	graphics/pokemon/shellos/footprint.png
#	graphics/pokemon/wormadam/footprint.png
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2020-11-03 00:13:51 -03:00
Eduardo Quezada D'Ottone
c598daf228 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-11-02 19:39:18 -03:00
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints 
Added footprints for the Gen. 5 species
 2020-11-02 10:28:06 -08:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities 
Toggle options for abilities and Egg Groups.
 2020-11-01 21:07:24 -06:00
Eduardo Quezada D'Ottone
910d502df2 Review changes 2020-11-01 19:23:45 -03:00
Eduardo Quezada D'Ottone
014afea3df Fixed Trapinch's evolutions abilities. 2020-11-01 16:59:03 -03:00
Eduardo Quezada D'Ottone
44e066cdb4 Fixed missing abilities. 2020-11-01 15:37:01 -03:00
Eduardo Quezada D'Ottone
2c3d4ec7c7 Moved P_UPDATED_STATS ifs to above typing. 2020-11-01 15:32:50 -03:00
LOuroboros
bdcd910397 Swapped tabs to spaces in footprint_table.h 2020-11-01 15:18:41 -03:00
Eduardo Quezada D'Ottone
ad5b728967 Fixed Quick Feet BATTLE_ENGINE define. 2020-11-01 14:50:08 -03:00
Eduardo Quezada D'Ottone
56056c01f4 Fixed identation for real. 2020-11-01 14:45:41 -03:00
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00
LOuroboros
6435158742 Added footprints for the Gen. 4 species 2020-10-27 09:38:04 -03:00
Eduardo Quezada
2964cc3828 Filled missing form names. 2020-10-26 22:53:31 -03:00
Eduardo Quezada
2c098d8294 Merge branch 'pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-10-26 20:06:37 -03:00
Eduardo Quezada
641daafb3f Fixed identation for better readability. 2020-10-25 12:34:48 -03:00
Eduardo Quezada
13a6b70e8c Updating Egg Groups. 2020-10-24 08:04:30 -03:00
Eduardo Quezada
67817ff9b9 Updated abilities. 2020-10-24 07:58:58 -03:00
Eduardo Quezada
1358197af4 Forms. 2020-10-24 07:41:49 -03:00