ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 03:58:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 1 Branch 0 Tags
Commit Graph

4864 Commits

Author SHA1 Message Date
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
09ff1524b4 Finish documenting credits 2021-03-29 19:58:29 -04:00
Kurausukun
102582a3df Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc 2021-03-29 18:36:18 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush 
Document Berry Crush
 2021-03-29 12:38:16 -04:00
GriffinR
62968895ca Add MON_PIC_SIZE constant 2021-03-29 09:38:19 -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
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
GriffinR
dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
GriffinR
557152b06e Minor link cleanup 2021-03-21 13:40:40 -05:00
Kurausukun
5b910a11b4 port miscellaneous fr documentation 2021-03-18 20:35:39 -04:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
BuffelSaft
7d237d8ff6 Implement Body Press' effect 
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
 2021-03-16 22:56:44 +13:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown 
Document minigame countdown
 2021-03-15 21:39:58 -04:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04: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
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen 
Add Ripen and Finish Gen4 Berries
 2021-03-13 11:16:42 -03:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
GriffinR
b1a69d95ea Document minigame countdown 2021-03-11 14:25:22 -05:00
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking 
Document Dodrio Berry Picking
 2021-03-10 18:55:41 -05:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
d5004638a9
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:47 -07:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
ghoulslash
68388f633f merge with be 2021-03-08 18:58:16 -07:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
ExpoSeed
f49da96f1d Fix consumable item form change 2021-03-03 15:24:58 -06:00
ExpoSeed
07af84db8a Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea 2021-03-03 13:54:25 -06:00
GriffinR
b9c733495b Document dodrio berry picking 2021-03-03 14:26:05 -05:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
Evan
41d47a867e format fixes 2021-03-03 10:48:57 -07:00
Evan
791fd5e709 finish berry hold effects 2021-03-03 09:25:25 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:07 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:13:49 -07:00
ExpoSeed
f7d42cd3c8 Formatting 2021-03-02 14:25:15 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7e8659c4ee Fix missed merge conflict 2021-03-02 14:17:48 -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
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities 
More Gen 8 Abilities
 2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00