ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 16:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,558 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

170 Commits

Author SHA1 Message Date
DizzyEggg
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata 
Misc battle and battle palace documentation
 2020-07-18 20:22:44 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
c8e1079736
Use stat constants in MonGainEVs 2020-07-16 09:58:16 +02:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
Flametix
4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00
Eduardo Quezada
8ca246332b Fixed Busted Mimikyu's dex when caught. 2020-06-21 01:02:09 -04:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
Eduardo Alvaro Quezada D'Ottone
e232f6bf03
Fix for Dark Type in party evolution. (#329) 2020-04-16 09:07:31 +02:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268) 
* Midnight Lycanroc

* Dusk Lycanroc
 2020-02-22 23:42:16 +01:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
DizzyEggg
153d2ac823 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-08 15:42:14 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
PikalaxALT
462acaa7dc sCombinedMoves 2020-02-01 12:07:40 -05:00
DizzyEggg
e1a428a25d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-31 21:17:19 +01:00
Sahith Nallapareddy
25df146054 using item constant 2020-01-20 07:51:18 -06:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
DizzyEggg
89a2ee5be6 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:54:25 +01:00
DizzyEggg
cd4c3b38b5 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:53:59 +01:00
Pokestia
e4731b1289 Pokemon expansion (#211) 
* Define species Meltan and Melmetal

Also shifted a few other species numbers

* Define Meltan and Melmetal Sprites

* Add Meltan and Melmetal coordinates and table entries

* Set Meltan and Melmetal ingame names

* Add Meltan and Melmetal base stats

* Add Meltan and Melmetal level up learnsets

* Set Meltan and Melmetal TM learnset

It is still blank because LGPE TMs don't match USUM TMs

* Define Meltan and Melmetal sprite paths

* Add Meltan and Melmetal sprite, icon and front animation

* Fix typo in bas stats

* Add Meltan and Melmetal pokedex entries

* Tab to space learnsets

* Tab to space pokedex text

This includes all mons with tabs in their dex entries.
 2019-12-30 13:48:50 +01:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
DizzyEggg
2a6e4e0a2a Merge with master 2019-12-09 08:29:10 +01:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
DizzyEggg
1a5c610b5c
Merge pull request #206 from LOuroboros/alolan_forms 
Alolan Forms
 2019-11-30 15:35:12 +01:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
huderlem
bef6150b59
Merge pull request #909 from GriffinRichards/doc-apprentice 
Document Apprentice
 2019-11-23 09:27:02 -06:00
Thomas Winwood
e3f7f47321 Turn some magic numbers into named constants 2019-11-23 07:53:26 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
LOuroboros
884f542798 Fixed a typo and added entries for the Alolan Forms in src/pokemon.c 2019-11-13 14:29:26 -03:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00
GriffinR
aec7eb6089 Clean up party_menu doc 2019-10-31 14:11:55 -04:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
4bbbbdc50a Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-10-19 15:30:14 +02:00
GriffinR
c4deb4db96 Document field_poison 2019-10-06 20:04:30 -04:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
GriffinR
a6847ca1d9 Note overflow in ModifyStatByNature 2019-10-05 09:24:57 -05:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR
80f58f7b24 Document PLAYER_HAS constants, consolidate poke constants 2019-09-22 08:14:22 -05:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
Eduardo Quezada D'Ottone
9d430a72db It doesn't check for Pokémon level using the same parameter as regionMapSectionId. 2019-09-15 19:56:53 -03:00