ExpoSeed
|
90d4359aeb
|
Fix constants
|
2020-10-12 19:11:41 -05:00 |
|
ExpoSeed
|
9e2c8a95c1
|
Sync bev2 with pret
|
2020-10-11 01:01:47 -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 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02: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
|
f70a9ce153
|
Merge with master
|
2020-08-27 12:01:28 +02: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
|
62dc94e9c8
|
Merge with master
|
2020-07-15 10:13:19 +02:00 |
|
DizzyEggg
|
ff5fc97859
|
Merge with master
|
2020-07-11 14:07:10 +02:00 |
|
DizzyEggg
|
4c3f40a361
|
Merge with master
|
2020-07-11 12:59:23 +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 |
|
DizzyEggg
|
013f9b6a17
|
merge wiith masteer and summary screen change
|
2020-05-29 12:50:54 +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 |
|
DizzyEggg
|
e00b76b8da
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
|
2020-04-15 13:31:52 +02:00 |
|
GriffinR
|
dde4a0416c
|
Label GCN link flags field
|
2020-04-13 08:42:31 -04:00 |
|
DizzyEggg
|
060b795d8e
|
Merge with master
|
2020-04-11 19:48:24 +02: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
|
108f6b711f
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
|
2020-02-23 10:58:26 +01:00 |
|
DizzyEggg
|
d8aab3d112
|
Merge with master
|
2020-01-18 18:17:25 +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
|
4c9ea32d19
|
Merge with master
|
2019-12-30 18:52:23 +01: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 |
|
DizzyEggg
|
9e3d5672e6
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
|
2019-12-23 16:40:21 +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 |
|
DizzyEggg
|
ac499bc896
|
Merge with master
|
2019-12-09 08:16:18 +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
|
dcb5d16cb3
|
Merge with master
|
2019-11-29 21:47:31 +01: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 |
|
DizzyEggg
|
8cc0439182
|
merge master
|
2019-11-22 22:47:19 +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 |
|
GriffinR
|
b2eb49888d
|
Clean up Apprentice doc
|
2019-11-20 19:00:08 -05:00 |
|
GriffinR
|
a05006421b
|
Document Apprentice
|
2019-11-20 17:36:52 -05:00 |
|
GriffinR
|
4e6a69c297
|
WIP Document Apprentice
|
2019-11-19 11:36:38 -05:00 |
|
GriffinR
|
a486c8affd
|
Begin documenting Apprentice, merge with master
|
2019-11-18 12:47:10 -05:00 |
|
GriffinR
|
b96fad074b
|
Rename neverRead fields
|
2019-11-16 13:02:35 -06:00 |
|
GriffinR
|
5e01871f8b
|
Document Trainer Hill
|
2019-11-16 13:02:35 -06:00 |
|
GriffinR
|
fc3783b739
|
WIP Document apprentice
|
2019-11-16 12:28:49 -05:00 |
|
DizzyEggg
|
c65900b67a
|
merge
|
2019-11-10 14:13:23 +01:00 |
|
DizzyEggg
|
1d8cc9b741
|
Fix merge conflicts
|
2019-11-03 19:55:19 +01:00 |
|
GriffinR
|
27169f634b
|
Review changes for party menu doc
|
2019-10-31 21:33:01 -04:00 |
|
GriffinR
|
973e6f9667
|
Document mauville_man.inc
|
2019-10-21 17:21:53 -05:00 |
|
DizzyEggg
|
bae5d2038f
|
Update with master
|
2019-10-10 16:18:48 +02:00 |
|
DizzyEggg
|
4c462a726e
|
Merge with master and learnsets
|
2019-10-06 15:57:33 +02:00 |
|
GriffinR
|
945d3d3a27
|
Merge branch 'master' into document-eventscripts
|
2019-09-17 00:10:23 -04:00 |
|
GriffinR
|
85d97542cd
|
Use MAX_MON_MOVES constants
|
2019-09-16 19:21:23 -05:00 |
|
GriffinR
|
9fbcd552de
|
document remainder of secret_base scripts, delete unneeded scripts.incs
|
2019-09-06 02:12:00 -04:00 |
|
PikalaxALT
|
904bba9e16
|
NULL_BATTLE_TOWER_POKEMON define
|
2019-09-05 20:48:48 -05:00 |
|
DizzyEggg
|
e96e98a8de
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
|
2019-08-25 13:10:32 +02:00 |
|
DizzyEggg
|
58b313956d
|
Merge with master
|
2019-08-25 12:51:09 +02:00 |
|
GriffinR
|
5fb7ab05dd
|
clean up
|
2019-08-21 17:06:55 -05:00 |
|
GriffinR
|
d931ba9602
|
document remaining funcs
|
2019-08-21 17:06:55 -05:00 |
|
GriffinR
|
7fc99f3952
|
favor lady funcs
|
2019-08-21 17:06:55 -05:00 |
|
GriffinR
|
009caa21c8
|
some contest lady funcs
|
2019-08-21 17:06:55 -05:00 |
|
GriffinR
|
fc467a9d52
|
standardize favour/favor
|
2019-08-21 17:06:55 -05:00 |
|
GriffinR
|
23979c4d7d
|
initial documentation commit
|
2019-08-21 17:06:55 -05:00 |
|
DizzyEggg
|
fabbc9ae31
|
Merge with master
|
2019-08-14 11:48:08 +02:00 |
|
DizzyEggg
|
0252270515
|
Merge with master
|
2019-08-12 11:25:05 +02:00 |
|
PikalaxALT
|
329670e16e
|
Minor fixes
|
2019-08-05 08:46:52 -04:00 |
|
DizzyEggg
|
4881e48994
|
Merge with master
|
2019-08-04 23:57:53 +02:00 |
|
DizzyEggg
|
c219776034
|
Merge with master
|
2019-08-04 23:09:28 +02:00 |
|
PikalaxALT
|
cd876292d1
|
Merge branch 'master' into pokenav_unk_2
|
2019-08-04 15:35:35 -04:00 |
|
DizzyEggg
|
e634e722cc
|
Decompile pokemon jump
|
2019-07-29 12:35:57 +02:00 |
|
PikalaxALT
|
e92e9a184c
|
Support for non-dkA toolchains
|
2019-06-28 22:26:11 -04:00 |
|
PikalaxALT
|
fb06e4a3c9
|
Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
|
2019-06-26 12:12:10 -04:00 |
|
DizzyEggg
|
ad6093f5bc
|
Merge with master, fix conflicts
|
2019-05-17 10:15:30 +02:00 |
|
DizzyEggg
|
f22f7866ac
|
Merge with master, fix conficts
|
2019-05-17 09:52:20 +02:00 |
|