88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -05:00
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
171154a097
Convert to -g; will be required for eliminating fakematches.
2020-09-16 19:36:30 -04:00
ee72696b53
Sync encounter musics with encounter music types
2020-08-20 21:03:24 -04:00
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
72edc46ab6
Document unk_transition
2020-07-02 15:45:37 -04:00
aaf5d91c18
Document field_message_box.c
2020-06-03 19:47:45 -05:00
b6c9ad505d
Minor fixes in trainer_battle.inc
2020-03-03 14:47:14 -05:00
956090b05f
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-02-12 13:05:57 -05:00
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
31b4656324
Labels better
2019-12-25 22:39:06 -05:00
ff2d8a9c4e
Add frontier trainer constants
2019-12-20 21:14:05 -05:00
db8a5c6c2b
Merge branch 'master' into fix-eventobj
2019-12-15 11:47:27 -05:00
0086cd1efa
More pokenav match call documentation
2019-12-08 15:25:21 -05:00
cc9b923dc2
More pokenav match call documentation
2019-12-06 02:35:08 -05:00
7034f59c14
Rename EventObj to ObjEvent
2019-11-21 00:14:40 -05:00
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
5e01871f8b
Document Trainer Hill
2019-11-16 13:02:35 -06:00
a727c16012
Use descriptive constant for ScriptGiveMon call
2019-11-09 08:37:45 -06:00
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
0db188b487
Clean up berry_tree.inc and misc adjacent documentation
2019-10-20 09:46:46 -05:00
c4deb4db96
Document field_poison
2019-10-06 20:04:30 -04:00
3c2576d3a3
trainer rematch macro
2019-08-16 13:48:45 -04:00
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05:00
8751fafad1
Make it compile
2019-04-05 07:53:23 -05:00
6916f09cd5
Expand MatchCallStruct defs, use REMATCH_* enum
2019-04-02 07:28:30 -05:00
65d8b68f9d
Expicitly hardcode rematch indecies
...
Inserting an entry without updating the indecies will now cause a
compiler error. This will make it easier for modders to remember to
update the constants.
2019-04-02 07:28:30 -05:00
5886f82ef5
Merge branch 'master' into extern-cleanup
2019-03-08 02:45:26 -05:00
3ceb1667c9
Reduce externs
2019-03-01 22:32:50 -05:00
bf45b83c65
Finish documenting event vars
2019-02-27 23:54:51 -05:00
3a88ab831d
Document more battle pyramid
2019-02-07 11:51:03 -06:00
edddd847c5
Document and clean up trainer hill
2019-01-13 20:50:08 +01:00
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
d59f5a8e56
Misc overworld documentation
2018-12-27 16:52:13 -06:00
dcbc8db6a3
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
2018-12-25 11:46:35 -06:00
442b1826a2
asm party and fldeff clean-up
2018-12-24 21:59:05 +01:00
9320fe8f85
Clear includes
2018-12-24 00:02:29 +01:00
5eac3ce1a2
rename fldeff_misc
2018-12-19 22:19:54 -05:00
e292d0ca83
Merge branch 'master' into fldeff
2018-12-16 20:05:31 -05:00
e1e2132a37
sync fldeff function names with pokeruby
2018-12-09 22:24:54 -05:00
6068495619
Document trainer battle scripts ( #430 )
2018-12-07 16:50:56 -06:00
10725def8e
trainerbattle_normal → trainerbattle_single
...
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
GriffinR