Commit Graph

81 Commits

Author SHA1 Message Date
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun 4c10f3f465 port GetFrontierOpponentClass fakematch fix 2020-10-25 23:55:38 -04:00
kageru 52ebc4252e Document gUnknown_03006298 2020-10-11 09:54:49 +02: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
PokeCodec aa45c05a3e Match Battle Tower 2020-09-09 11:21:16 -04:00
PikalaxALT cd895e497d Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
2020-08-21 12:44:07 -04:00
GriffinR 0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -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 4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
GriffinR 72edc46ab6 Document unk_transition 2020-07-02 15:45:37 -04:00
GriffinR 7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
GriffinR 655910a16f Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
huderlem fa5816915d Merge pull request #949 from GriffinRichards/doc-dome
Document Battle Dome and add facility party constants
2020-01-12 20:10:03 -06:00
GriffinR 6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06: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
GriffinR 017fa294b5 Add battle tent mon/trainer constants 2020-01-08 01:07:53 -05:00
GriffinR fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
GriffinR bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
GriffinR 3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
GriffinR ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
GriffinR 63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
GriffinR c51e0f3bae Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR 9fcfbdbef5 Set up Battle Factory macros 2019-12-05 21:11:17 -06:00
GriffinR 9b3d1cfab6 Set up Battle Dome and Tower macros 2019-12-05 21:11:17 -06:00
GriffinR be17c1602d Set up remaining facility script doc, use Palace macros 2019-12-05 21:11:17 -06:00
GriffinR f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05: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
GriffinR 7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -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
GriffinR a05006421b Document Apprentice 2019-11-20 17:36:52 -05:00
GriffinR 5393b42f7c Remove SpriteCB_Null name 2019-11-17 08:16:28 -06:00
GriffinR f7e17ca985 Document Ranking Hall scripts 2019-11-17 08:16:28 -06:00
GriffinR ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
GriffinR 5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR 6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR 85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
GriffinR 5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
DizzyEggg b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
Phlosioneer 9372731c3e Merge branch 'master' into main-menu-state-machine 2019-03-02 17:35:44 -05:00
Marcus Huderle 4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Phlosioneer d979ac3bf3 Document main_menu state machine, name window constants
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
2019-02-11 00:34:50 -05:00
Marcus Huderle 3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
DizzyEggg 11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
Tetrable a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable 1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00