ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-22 19:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,419 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

243 Commits

Author SHA1 Message Date
kiliwily
f1366dfc69 Fix typos 2020-09-19 20:46:26 +02:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
kiliwily
9b4ded46c6 Update pokemon.c 2020-09-12 19:20:42 +02:00
kiliwily
5c3669e0cd Bug documenting 2020-09-12 18:43:20 +02:00
PokeCodec
7f1827767c Document size field of unknown struct 2020-09-09 16:09:31 -04:00
PokeCodec
a32f631fe6 Fix Pokemon Fakematch 2020-09-09 15:59:34 -04:00
PokeCodec
84a92279c9 Record mixing fakematch fixed! 2020-09-09 15:49:51 -04:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
PokeCodec
e6684664ba Fix casting bug 2020-09-06 15:16:40 -04:00
PokeCodec
a7a64ecba0 Fixup ModifyStatByNature 2020-09-05 11:47:24 -04:00
GriffinR
a9719c92bf
Merge pull request #1160 from kiliwily/master2 
add MAX_LEVEL_UP_MOVES macro
 2020-08-28 19:18:03 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-28 16:14:21 -04:00
kiliwily
5e7b6a089c add MAX_LEVEL_UP_MOVES macro 2020-08-28 20:36:07 +02:00
Thomas Winwood
58786a7ac0 Add MAX_PER_STAT_EVS macro 2020-08-28 02:25:02 +01:00
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
PikalaxALT
cd895e497d
Merge pull request #1141 from GriffinRichards/add-nonmatch 
Wrap asm statements in NONMATCHING
 2020-08-21 12:44:07 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg 
Add stat stage constants, clean up misc battle msg data
 2020-08-10 14:29:27 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
DizzyEggg
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04: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