ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-09 06:42:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,628 Commits 1 Branch 0 Tags
Commit Graph

4473 Commits

Author SHA1 Message Date
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -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
GriffinR
fa3acd79e7 Fix missing header for sub_817F77C BUGFIX 2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205 Move SeedRngWithRtc fix to BUGFIX conditional 2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master 
Document the unused battle strings for downpour weather
 2021-01-11 10:01:57 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage 2021-01-11 08:49:31 -05:00
SatoMew
ead437e89b Document the unused battle strings for downpour weather 2021-01-10 22:26:00 +00:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo 
Add missing braces to bugfix in CalculateMonStats
 2021-01-10 12:34:39 -05:00
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01:00
GriffinR
8afc28c98f Add missing braces to bugfix in CalculateMonStats 2021-01-10 12:24:59 -05: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
f02afc134b Use the correct constant for max-IV masks 2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
SphericalIce
fb69d97b24 Use the constant for the max total of EVs 2021-01-07 21:11:45 +00:00
GriffinR
c506cf747f
Merge pull request #1293 from GriffinRichards/typo-pyramind 
Fix sPyramindFloorNames typo
 2021-01-05 00:16:24 -05:00
GriffinR
fe5269b875 Fix sPyramindFloorNames typo 2021-01-04 23:58:33 -05: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
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu 
Remove unnecessary subtraction in switch
 2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master 
Fix/document possible division by zero in ConvertScaleParam
 2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c Remove unnecessary subtraction in switch 2021-01-04 19:50:05 -05:00
Sierraffinity
67a656a4df Fix/document possible division by zero in ConvertScaleParam 2021-01-04 16:26:28 -08: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
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
GriffinR
06af0f0fe5 Remove unnecessary string.h includes 2021-01-03 13:36:07 -05:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen 
Document battle factory screen
 2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr 
Minor field_screen_effect / field_player_avatar documentation
 2021-01-03 01:59:36 -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
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc 
Index battle controller cmd tables
 2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2 Label a few flash effect functions 2021-01-01 13:34:25 -05:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
GriffinR
84fbcc9dd6 Fix modern -> UBFIX macro change 2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
093610b46e Finish factory swap screen doc 2020-12-31 00:26:14 -05:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
GriffinR
7ae78dc773 Finish factory select screen doc 2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d Index battle controller cmd tables 2020-12-29 17:21:58 -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
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