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

5670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05: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
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05: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
GriffinR
9e08cfe55f Remove uses of compare_var_to 2019-12-18 19:22:39 -05:00
GriffinR
d137a1a0c1 Use constants in compare macro 2019-12-18 19:12:09 -05:00
Diegoisawesome
3b240b2ad4
Merge pull request #938 from pret/ubuntu_bionic 
Bump travis to bionic (Ubuntu 18.04 LTS)
 2019-12-18 13:32:25 -08:00
ultima-soul
df95c4801a
Spaces to tabs 2019-12-18 13:03:01 -08:00
PikalaxALT
5f1c7c9e93
Bump travis to bionic (Ubuntu 18.04 LTS) 2019-12-18 13:03:00 -05:00
GriffinR
23f952b34e Merge master into doc-tower 2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush 
berry crush
 2019-12-17 19:35:00 -06:00
huderlem
45eefac5b9
Merge pull request #934 from GriffinRichards/constants-fade 
Use fadescreen constants
 2019-12-17 19:26:04 -06:00
GriffinR
4879c1eab2
Merge branch 'master' into constants-fade 2019-12-17 19:11:51 -05:00
huderlem
edb5df1716
Merge pull request #933 from GriffinRichards/doc-tents 
Document Battle Tent scripts
 2019-12-17 18:09:49 -06:00
jiangzhengwenjz
420b4b3fea use STR_CONV_MODE_* constants 2019-12-18 06:42:53 +08:00
jiangzhengwenjz
5bec27aa34 nonmatch sub_8024604 2019-12-18 03:36:51 +08:00
jiangzhengwenjz
67690df65f sub_8023CAC 2019-12-17 23:12:01 +08:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
jiangzhengwenjz
50c48d7ef6 sub_8023BC0 2019-12-17 14:49:57 +08:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
jiangzhengwenjz
efa1ee1822 sub_8022250 2019-12-16 14:17:29 +08:00
jiangzhengwenjz
3f858c1c26 sub_8022F04 2019-12-16 14:17:29 +08:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall 
Document some pokenav match call
 2019-12-15 09:42:13 -06:00
GriffinR
a04347816f Split PokenavMatchCallEntries from PokenavMonList 2019-12-15 10:25:47 -05:00
GriffinR
97b5560bdb Document Battle Tent scripts 2019-12-15 01:47:01 -05:00
AJ Fontaine
2e7c21e528
Vise Grip to Vice Grip 
The weird thing is "vice" is the British way of saying it and "vise" is the American way, but the change happened in games based on the UK. Now matches its Gen 7 name.
 2019-12-14 17:01:33 -05:00
GriffinR
6967caefb2 Split finditem_std from giveitem_std 2019-12-14 08:41:46 -06:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
aa72c0ada3 Document Battle Factory scripts 2019-12-14 08:32:32 -06:00