Commit Graph

6264 Commits

Author SHA1 Message Date
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ultima-soul
76851eb672
Merge pull request #1380 from amiosi/kyurem
Kyurem form moveset swap
2021-01-31 13:32:31 -08:00
amiosi
fe3419fa21 Update level_up_learnsets.h 2021-01-29 15:51:53 -05:00
ultima-soul
0f142048bf
Merge pull request #1373 from LOuroboros/riolu
Corrected Riolu's evo method
2021-01-27 14:07:27 -08:00
LOuroboros
6e89f8dff2 Corrected Riolu's evo method 2021-01-27 19:02:37 -03: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
fe7f2f18a4
Merge pull request #1328 from ultima-soul/add_fairy_frlg_icon_pe
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
2021-01-21 12:19:41 -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
ghoulslash
a05e7cc6f9
Merge pull request #1345 from ultima-soul/sync_be_move_constants_pe
Sync Battle Engine Defines for Crown Tundra Moves and Renamed Moves
2021-01-13 21:39:22 -07:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08:00
ghoulslash
a24ce5c715
Merge pull request #1341 from SBird1337/pokemon_expansion
Define missing Items for gEvolutionTable
2021-01-12 09:21:58 -07: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
2a13e85785
Merge pull request #1340 from ultima-soul/gen_8_mon_data
Corrected Defines for Item Expansion-introduced Items in Gen 8 Species Data
2021-01-08 20:07:44 -08:00
ultima-soul
767f26b73c Corrected defines for Item Expansion-introduced items for Gen 8 species data. 2021-01-08 19:06:20 -08:00
ghoulslash
0d246af3db
Merge pull request #1324 from ExpoSeed/PE/sync
Sync Pokemon Expansion
2021-01-07 11:49:51 -07: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
ultima-soul
b58a8390f3 Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:21:52 -08:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
GriffinR
dfe03618c7
Merge pull request #1284 from GriffinRichards/deadname
Remove deadnaming, sync BgEvent
2020-12-31 14:35:23 -05:00
GriffinR
ef60edd933 Remove deadnaming, sync BgEvent 2020-12-31 14:27:46 -05:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
GriffinR
0c74e2097f
Merge pull request #1282 from Sierraffinity/master
Change how mon affine transform fix is handled
2020-12-30 21:21:12 -05:00
Sierraffinity
b88922daea Merge branch 'master' of github.com:pret/pokeemerald 2020-12-30 17:37:17 -08:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
ghoulslash
660ee76452
Merge pull request #1318 from LOuroboros/patch-1
Tweaked evolution.h
2020-12-27 19:56:33 -07: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
GriffinR
e1fd2f2a89
Merge pull request #1280 from Sierraffinity/master
Add fixes for undefined behavior with modern compiler
2020-12-26 22:08:48 -05:00
Sierraffinity
127bb97c0e Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite 2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d Add UBFIX for null deref in sub_80D08CC 2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6 Add UBFIX for null derefs in sub_8088950 2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea Add UBFIX for null deref in CameraObjectReset2 2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower
Label remaining subs in battle_tower.c
2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08:00
GriffinR
4ec5c888b4
Merge pull request #1275 from Kurausukun/berrycrush_nonmatching
[LEAK INFORMED] Correct Berry Crush Structs and Eliminate Non/Fakematchings
2020-12-22 00:16:36 -05:00
Kurausukun
254b4e621c change "filler" to "unk", remove newline 2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8 fix remaining functions, finally matches 2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390 oops 2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6 fix sub_8021A28 2020-12-21 20:24:36 -05:00