ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,595 Commits 1 Branch 0 Tags 235 MiB
952bdbd9f5
Commit Graph

5595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
952bdbd9f5 Steadfast string fix 2020-01-04 18:41:59 +01:00
DizzyEggg
cafb0c3b6a Fix Surf taking 3 pp 2020-01-04 18:17:26 +01:00
DizzyEggg
fcf5870062 Fix wild mons in double battles not having item 2020-01-01 11:12:04 +01:00
DizzyEggg
d21449e19c Fix Lava Plume animation in double battles 2020-01-01 10:57:27 +01:00
DizzyEggg
b69292248c Add constants for special multi battles 2020-01-01 00:22:42 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
7051f261d1 Fix Queenly Majesty 2019-12-31 13:33:54 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
770a57bec7 Fix some moves hitting the user 2019-12-30 13:14:20 +01:00
Marcus Huderle
ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
Fontbane
2e8c20d72f Update trainers.h 2019-12-25 20:48:40 -05:00
huderlem
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse 
Document item_use.c
 2019-12-25 11:59:07 -06:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
DizzyEggg
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath 
Implemented Aftermath's effect
 2019-12-25 12:04:09 +01:00
DizzyEggg
5e5767bb5c
Merge pull request #216 from ultima-soul/unburden 
Implement Unburden
 2019-12-25 12:01:25 +01:00
ultima-soul
332aa80a33 Resolve review comments and encapsulate Unburden check and set. 2019-12-23 09:25:26 -08:00
LOuroboros
3367bdaf51 Made Aftermath trigger the Ability Pop Up sign 2019-12-23 14:17:54 -03:00
ultima-soul
5786745d15 Merge branch 'battle_engine' into unburden 2019-12-23 09:01:16 -08:00
DizzyEggg
ea9109943d Aurora Veil now only works in Hail 2019-12-23 17:50:13 +01:00
DizzyEggg
63621da46c Heatproof lowers burn dmg 2019-12-23 17:41:42 +01:00
DizzyEggg
cec9e177d6 Gooey add check for not displaying ability pop up when not necessary 2019-12-23 17:26:48 +01:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey 
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
 2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
34bd81871c
Merge pull request #208 from Fontbane/patch-4 
Change move names to CamelCase
 2019-12-23 17:11:32 +01:00
DizzyEggg
15d34c3513 Fix strings coz they had the same name for some unknown to me reason 2019-12-23 17:09:13 +01:00
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names 
Name describes where the battle is and for rivals, which starter the player chose.
 2019-12-23 10:42:06 -05:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
Diegoisawesome
d42ea06dc5
Merge pull request #939 from GriffinRichards/fix-compare 
Use constants in compare macro
 2019-12-20 23:40:12 -08:00
Diegoisawesome
e4e3d439dc
Merge pull request #941 from GriffinRichards/fix-lastresult 
Remove references to LASTRESULT
 2019-12-20 23:38:56 -08:00
Diegoisawesome
4e10133545
Merge pull request #940 from Kurausukun/master 
update instrument sample names
 2019-12-20 23:38:30 -08:00
GriffinR
324a81ed5d Reword yesnobox comment 2019-12-20 18:53:58 -05:00
Diegoisawesome
773a599bbb
Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo 
'real' match DrawTradeMenuPartyInfo
 2019-12-20 15:49:14 -08:00
Diegoisawesome
929a093fc1
Merge pull request #943 from jiangzhengwenjz/CanSpinTradeMon 
real match CanSpinTradeMon
 2019-12-20 15:49:05 -08:00
Fontbane
40b7d8573d Gooey and Tangling Hair 2019-12-20 17:38:38 -05:00
jiangzhengwenjz
4d8ea3a2d9 CanSpinTradeMon 2019-12-21 06:18:20 +08:00
jiangzhengwenjz
681d929892 DrawTradeMenuPartyInfo 2019-12-21 06:09:59 +08:00
GriffinR
7628019952 Remove references to LASTRESULT 2019-12-20 08:51:58 -05:00
Fontbane
2fb6ea4fc4 Big Pecks 2019-12-19 14:01:46 -05:00
Fontbane
186822ed0c Fix missing parentheses 2019-12-19 13:53:07 -05:00
Fontbane
8b3a40162b Queenly Majesty 2019-12-19 13:50:19 -05:00
Fontbane
98ce80d231 Fix move names 2019-12-19 13:47:31 -05:00
Kurausukun
3a7bb65077 update instrument sample names 2019-12-19 03:42:09 -05:00