Commit Graph

4694 Commits

Author SHA1 Message Date
GriffinR
60a592a2c3 Condense fallthrough scripts 2019-10-15 17:09:47 -05:00
GriffinR
348bb002a8 Document Gym scripts first half 2019-10-15 17:09:47 -05:00
huderlem
a0b3f5d9e3
Merge pull request #833 from GriffinRichards/doc-inc2
Document .incs split from event_scripts Round 2
2019-10-15 16:30:27 -05:00
Sewef
07ac727c6d Document Oamdata in battle_anim (#838) 2019-10-14 18:26:47 -05:00
GriffinR
928cdf2531
Merge branch 'master' into doc-inc2 2019-10-14 19:25:10 -04:00
huderlem
26962b7725
Merge pull request #830 from GriffinRichards/doc-inc
Document some .incs split from event_scripts
2019-10-14 18:22:35 -05:00
garak
9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak
4a79081197 replace inja license text 2019-10-14 18:12:03 -05:00
garak
92d28c5daf add MIN_LEVEL define to pokemon constants 2019-10-14 18:12:03 -05:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
garak
74477471a6 update inja 2019-10-14 18:12:03 -05:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2 2019-10-13 15:44:07 -04:00
GriffinR
60a9dc6a0e Fix map script names 2019-10-13 15:40:15 -04:00
GriffinR
bb23128b77 Merge conflict resolves into review changes 2019-10-13 15:33:19 -04:00
GriffinR
144c5888a1 Fix map script names 2019-10-13 15:29:53 -04:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc 2019-10-13 15:26:44 -04:00
Marcus Huderle
e47b3efdfe Unify showmonpic and hidemonpic script command names with their function names 2019-10-12 18:58:54 -05:00
huderlem
0278209376
Merge pull request #834 from GriffinRichards/document-trade
Document trade.c and some Union Room trading board
2019-10-12 15:47:17 -05:00
Marcus Huderle
8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
GriffinR
4e2be7ff5e Review changes for #835 2019-10-12 15:14:57 -05:00
GriffinR
714b122da6 Fix indentation 2019-10-12 15:14:57 -05:00
GriffinR
1c99f5b7c9 Split text from cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR
1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
jiangzhengwenjz
9b81fe1b62 sub_810E520 2019-10-11 20:11:00 -05:00
GriffinR
3514f9dd6b Clean up trade.c doc 2019-10-10 18:46:42 -04:00
GriffinR
07fa82c911 Last non-anim trade.c doc 2019-10-10 03:50:51 -04:00
GriffinR
32aa87c7e1 More trade doc, fix switch indentations 2019-10-09 14:21:29 -04:00
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR
d1bcd60b58 Document more trade.c 2019-10-08 20:25:46 -04:00
GriffinR
70d1d8956e Document elite_four.inc and the E4 map scripts 2019-10-08 02:25:31 -04:00
GriffinR
2368f57669
Merge branch 'master' into doc-inc 2019-10-07 17:37:35 -04:00
GriffinR
d8f5e73bb7
Merge branch 'master' into doc-inc 2019-10-07 17:37:04 -04:00
GriffinR
bcf74df27f Use B_OUTCOME constants for GetBattleOutcome 2019-10-07 16:36:47 -05:00
GriffinR
7ba11b7a1b Use VAR_FACING constants 2019-10-07 16:36:02 -05:00
GriffinR
628301d6d5 Document unusual_weather.inc 2019-10-07 11:29:14 -04:00
GriffinR
9553ec1d28 Document mevent.inc 2019-10-07 10:34:12 -04:00
GriffinR
0df304d629 Document roulette.inc 2019-10-07 02:00:16 -04:00
GriffinR
81ee8f07ef Document pc.inc and prof_birch.inc 2019-10-07 01:13:34 -04:00
GriffinR
c4deb4db96 Document field_poison 2019-10-06 20:04:30 -04:00
GriffinR
f179ab95c0 Document move tutors 2019-10-06 17:30:17 -04:00
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
huderlem
00629ad94e
Merge pull request #828 from huderlem/reflection_movement
Document hide/show reflection movement actions
2019-10-06 15:14:14 -05:00
GriffinR
02070eaf73 Document kecleon 2019-10-06 16:06:34 -04:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR
748a1dbdd4 Document cave hole 2019-10-06 14:16:37 -04:00
GriffinR
d914c1d659 Document common movements 2019-10-06 13:55:30 -04:00
huderlem
c0b0602516
Merge pull request #819 from GriffinRichards/document-eventscripts
Split some files from event_scripts
2019-10-05 09:59:43 -05:00
GriffinR
749247b910 Convert 4 spaces in .inc to tab 2019-10-05 10:52:48 -04:00
GriffinR
66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
GriffinR
a6847ca1d9 Note overflow in ModifyStatByNature 2019-10-05 09:24:57 -05:00