ExpoSeed
|
a539045dae
|
Relocate and redefine POKEMON_SLOTS_NUMBER
|
2020-10-13 12:05:42 -05:00 |
|
ExpoSeed
|
3f8d71b8fd
|
Relocate POKEMON_SLOTS_NUMBER to avoid merge conflict
|
2020-10-12 21:24:35 -05:00 |
|
ExpoSeed
|
90d4359aeb
|
Fix constants
|
2020-10-12 19:11:41 -05:00 |
|
ExpoSeed
|
5794fc69e8
|
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
|
2020-10-04 02:35:23 -05:00 |
|
GriffinR
|
5259898325
|
Replace POKEMON_SLOTS_NUMBER
|
2020-10-01 17:07:12 -05:00 |
|
DizzyEggg
|
448599f53c
|
Merge with master
|
2020-09-08 12:01:20 +02:00 |
|
PokeCodec
|
da582d5258
|
Make JOY Macros match
|
2020-09-04 20:41:29 -04:00 |
|
DizzyEggg
|
c2733236be
|
Merge with master
|
2020-08-27 11:36:35 +02:00 |
|
GriffinR
|
22c1bf965a
|
Finish documenting berry blender
|
2020-08-24 17:06:55 -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
|
463d79c7c1
|
Start documenting naming screen
|
2020-08-07 02:00:41 -04: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 |
|
DizzyEggg
|
ff5fc97859
|
Merge with master
|
2020-07-11 14:07:10 +02:00 |
|
GriffinR
|
beeb673ba1
|
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
|
2020-07-08 16:03:32 -04:00 |
|
GriffinR
|
431c60c92c
|
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
|
2020-07-08 15:45:31 -04:00 |
|
GriffinR
|
06025e887f
|
Allow flag/var counts to be updated alongside values
|
2020-06-24 17:00:19 -04:00 |
|
GriffinR
|
24569583e4
|
Document contest results
|
2020-06-18 17:50:13 -04:00 |
|
GriffinR
|
7632404ba5
|
Document union_room_chat.c
|
2020-06-02 18:35:00 -04:00 |
|
DizzyEggg
|
cca1dcc04a
|
merge with master
|
2020-05-29 13:07:53 +02:00 |
|
GriffinR
|
f9e6f7540f
|
Use fixed point macros for math util
|
2020-05-24 08:28:02 -05:00 |
|
DizzyEggg
|
88bdeed1a6
|
Merge with master
|
2020-04-15 14:40:16 +02:00 |
|
GriffinR
|
dde4a0416c
|
Label GCN link flags field
|
2020-04-13 08:42:31 -04:00 |
|
Martin Griffin
|
4485d51522
|
Document decoration.c
|
2020-03-06 09:47:20 +00:00 |
|
DizzyEggg
|
3c938d1809
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2020-02-23 12:42:21 +01:00 |
|
DizzyEggg
|
26e109d788
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2020-01-18 15:06:43 +01:00 |
|
GriffinR
|
655910a16f
|
Merge branch 'master' into fix-eventobj
|
2020-01-12 22:42:43 -05:00 |
|
DizzyEggg
|
f1d1557a39
|
Merge with master
|
2020-01-12 15:06:52 +01:00 |
|
GriffinR
|
ef67f2d33b
|
Merge master into ObjEvent rename and prune accidental inclusions
|
2020-01-08 05:43:06 -05:00 |
|
GriffinR
|
e5df61e362
|
Merge branch 'master' into doc-dome
|
2020-01-08 01:15:36 -05:00 |
|
DizzyEggg
|
cd4c3b38b5
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2019-12-30 13:53:59 +01:00 |
|
GriffinR
|
3efc8199d4
|
More battle_dome.c documentation
|
2019-12-25 22:27:33 -08:00 |
|
DizzyEggg
|
a4a4132d26
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2019-12-23 16:41:44 +01:00 |
|
GriffinR
|
63c8cf97d1
|
Document Battle Dome scripts and some battle_dome.c
|
2019-12-20 16:53:33 -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 |
|
GriffinR
|
db8a5c6c2b
|
Merge branch 'master' into fix-eventobj
|
2019-12-15 11:47:27 -05:00 |
|
GriffinR
|
47b0d8a597
|
Merge branch 'master' into doc-matchcall
|
2019-12-10 20:43:27 -05:00 |
|
DizzyEggg
|
2a6e4e0a2a
|
Merge with master
|
2019-12-09 08:29:10 +01:00 |
|
GriffinR
|
c51e0f3bae
|
Merge branch 'master' into fix-eventobj
|
2019-12-06 02:34:54 -05:00 |
|
GriffinR
|
be17c1602d
|
Set up remaining facility script doc, use Palace macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
548af3c0f1
|
Document a bit of Match Call
|
2019-12-05 15:33:36 -05:00 |
|
DizzyEggg
|
7ff3f32a95
|
Merge
|
2019-11-29 21:05:44 +01:00 |
|
GriffinR
|
f559fa3fe2
|
Merge master into ObjEvent rename
|
2019-11-25 20:00:04 -05:00 |
|
GriffinR
|
0db46e84bc
|
Use macros for FRONTIER_DATA_6, fix offset comment
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
63ee15fc28
|
Document Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
4dfa959fa2
|
Begin documenting Battle Pike and Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|
DizzyEggg
|
b70cde8f1b
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2019-11-22 23:11:17 +01: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 |
|