ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 08:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,478 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

233 Commits

Author SHA1 Message Date
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
e06de33cbd
Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
DizzyEggg
6537310387 Merge with master 2020-07-15 10:23:58 +02:00
DizzyEggg
62dc94e9c8 Merge with master 2020-07-15 10:13:19 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
DizzyEggg
4fc88d18aa Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-29 09:17:25 +02:00
DizzyEggg
f86282f423 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-29 08:47:51 +02:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
DizzyEggg
5054727167 Allow second mon to throw a ball if first dead 2020-02-16 13:24:50 +01:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05: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
GriffinR
949509aade
Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
DizzyEggg
871e093b65 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-12-09 08:20:29 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
41c1c9ca8a Set up Battle Pike macros 2019-12-05 21:11:17 -06:00
GriffinR
4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
huderlem
6eaac9ea9d
Merge pull request #863 from GriffinRichards/doc-partymenu 
Document party menu
 2019-10-31 21:36:56 -05:00
tustin2121
218fcd99b3 Itemfinder code should use flag constant 2019-10-31 21:34:03 -05:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR
0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00