ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,497 Commits 1 Branch 0 Tags 235 MiB
97d0643110
Commit Graph

202 Commits

Author SHA1 Message Date
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02: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
f70a9ce153 Merge with master 2020-08-27 12:01:28 +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
DizzyEggg
427bad6413 Fix Switch-in ability battler sometimes not properly printed 2020-07-28 10:18:44 +02:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +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
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
Flametix
4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
Eduardo Alvaro Quezada D'Ottone
1fdb195bd9
Added Gen 8 overworld effects. (#342) 
- LIGHTNING_ROD
- FLASH_FIRE
- HARVEST
- STORM_DRAIN
- MAGNET_PULL
- INFILTRATOR
- SUPER LUCK
 2020-04-20 13:22:42 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
d28992d2ed Anticipation clean-up 2020-04-11 12:34:53 +02:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
DizzyEggg
14bc2f65f3 Fix AI trying to switch when it can't, also ghosts can escape 2020-02-08 14:20:02 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +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
8889039a57 Merge with master 2020-01-31 21:15:08 +01:00
Sahith Nallapareddy
25df146054 using item constant 2020-01-20 07:51:18 -06:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +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
fcf5870062 Fix wild mons in double battles not having item 2020-01-01 11:12:04 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +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
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +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
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
aec7eb6089 Clean up party_menu doc 2019-10-31 14:11:55 -04:00