Commit Graph

2026 Commits

Author SHA1 Message Date
ultima-soul
df95c4801a
Spaces to tabs 2019-12-18 13:03:01 -08: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
4879c1eab2
Merge branch 'master' into constants-fade 2019-12-17 19:11:51 -05:00
huderlem
edb5df1716
Merge pull request #933 from GriffinRichards/doc-tents
Document Battle Tent scripts
2019-12-17 18:09:49 -06:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall
Document some pokenav match call
2019-12-15 09:42:13 -06:00
GriffinR
97b5560bdb Document Battle Tent scripts 2019-12-15 01:47:01 -05:00
GriffinR
6967caefb2 Split finditem_std from giveitem_std 2019-12-14 08:41:46 -06:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
aa72c0ada3 Document Battle Factory scripts 2019-12-14 08:32:32 -06:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall 2019-12-10 20:43:27 -05:00
GriffinR
49f1a90534 Document Battle Pike scripts 2019-12-10 19:31:27 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
fe16452999 Typo fix 2019-12-10 19:28:16 -06:00
GriffinR
fcd8d37d62 Document Battle Palace scripts 2019-12-10 19:28:16 -06:00
Exory
7e6f34777b
Don't burn the opponent if it has Flare Boost. 2019-12-10 22:29:20 +01:00
Exory
3c7e60a441
Don't use Toxic if opponent has Toxic Boost. 2019-12-10 22:01:20 +01:00
DizzyEggg
740ab29c7c
Merge pull request #204 from cfmnephrite/beta
Dancer
2019-12-09 08:36:22 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
Nephrite
0343f63eda Dancer
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-12-07 10:19:01 +00:00
GriffinR
efaea2a3ab Revert WEATHER_CLOUDY to WEATHER_SHADE 2019-12-06 19:05:28 -06:00
GriffinR
a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR
7beddd16dd Document missed scripts/text 2019-12-05 21:20:55 -06:00
GriffinR
49c6ae1ac6 Add some macro comments 2019-12-05 21:11:17 -06:00
GriffinR
467a103bcc Set up Battle Tent macros 2019-12-05 21:11:17 -06:00
GriffinR
fdae25eab2 Set up Battle Pyramid macros 2019-12-05 21:11:17 -06:00
GriffinR
9fcfbdbef5 Set up Battle Factory macros 2019-12-05 21:11:17 -06:00
GriffinR
41c1c9ca8a Set up Battle Pike 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
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
GriffinR
df1fce705c Fix hard-coded string ptr 2019-11-29 00:10:55 -05:00
GriffinR
8d870d94c9 Document Battle Arena scripts 2019-11-26 18:47:48 -06: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
08a8dc46e3 Use macros for Trainer Hill 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
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3
battle_anim_effects_3
2019-11-24 12:02:54 -06:00
huderlem
bef6150b59
Merge pull request #909 from GriffinRichards/doc-apprentice
Document Apprentice
2019-11-23 09:27:02 -06:00
Sewef
1dfe34dee3 TriForce → TriAttack 2019-11-23 15:51:08 +01:00
GriffinR
2bf1e0600e Consolidate apprentice_buff macros 2019-11-23 08:09:25 -05:00
Sewef
4f590e8f61 battle_anim_effects_3 (4) 2019-11-23 11:57:39 +01:00
DizzyEggg
88244463e9 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-22 22:50:03 +01:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
a05006421b Document Apprentice 2019-11-20 17:36:52 -05:00
GriffinR
215bb31d67 Clean up Trainer Fan Club doc 2019-11-20 09:08:24 -06:00
GriffinR
5c5c1836bb Document Trainer Fan Club 2019-11-20 09:08:24 -06: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
6ac7efb54f Document Scotts House and begin frontier macros 2019-11-17 08:16:28 -06:00
GriffinR
f7e17ca985 Document Ranking Hall scripts 2019-11-17 08:16:28 -06:00
GriffinR
d6e681066b Document Battle Frontier outside scripts 2019-11-17 08:16:28 -06:00
GriffinR
3bbdee61b8 Clean up Trainer Hill doc 2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328 Document contest strings 2019-11-16 12:50:01 -06:00
GriffinR
0513e05c38 Document Frontier Reception Gate 2019-11-16 12:00:35 -06:00
GriffinR
248b85c3cb Document Frontier Exchange Corner scripts 2019-11-16 12:00:35 -06:00
GriffinR
dadaba3075 Fix bet amount typo 2019-11-16 11:37:34 -06:00
GriffinR
57a66bb22d Document Battle Frontier lounges 2019-11-16 11:37:34 -06:00
huderlem
0a43f2ce53
Merge pull request #899 from GriffinRichards/doc-scriptclean
Document interview and TV scripts, and misc script clean up
2019-11-16 11:34:47 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
GriffinR
0f53aeb19b Document SS Tidal scripts 2019-11-14 18:07:56 -06:00
GriffinR
00f22b6400 Document remaining routes (104, 119-123) 2019-11-14 17:51:02 -06:00
GriffinR
525ec2025d Document Routes 111-118 2019-11-14 17:41:01 -06:00
GriffinR
0ba591d26f Document ocean routes 2019-11-14 17:29:46 -06:00
GriffinR
ff7e11c0b0
Merge branch 'master' into doc-scriptclean 2019-11-13 19:25:41 -05:00
GriffinR
ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
GriffinR
af83b41dd1 Document Contest Hall berry blenders and misc 2019-11-13 18:20:55 -06:00
GriffinR
c0ae1cbc1c Document Lilycove scripts 2019-11-13 18:20:55 -06:00
GriffinR
7455bd9b9a Document interview and TV scripts, and misc script clean up 2019-11-12 14:20:05 -05:00
Marcus Huderle
8e65f0188f Rename contest_painting_effects to image_processing_effects 2019-11-10 16:37:26 -06:00
Marcus Huderle
1ed3af66eb Document contest painting image processing effects 2019-11-10 16:37:26 -06:00
GriffinR
6c863f6724 Document Sootopolis scripts 2019-11-10 16:37:14 -06:00
GriffinR
a3ee92a4e7 Document some frontier util funcs 2019-11-10 16:37:14 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
GriffinR
5ac8b126e9 Document Mt Pyre scripts 2019-11-09 12:32:13 -06:00
GriffinR
e4d65addf4 Document Mossdeep scripts 2019-11-09 10:42:52 -06:00
huderlem
ed76620d28
Merge pull request #880 from GriffinRichards/doc-trickhouse
Document Trick House scripts
2019-11-09 08:48:49 -06:00
GriffinR
ae1767fe46 Document Mystery Event Club script 2019-11-09 08:41:43 -06:00
GriffinR
06bb4ba402 Document Secret Power TM script 2019-11-09 08:41:43 -06:00
GriffinR
8702972067 Document Sky Pillar outside 2019-11-09 08:41:43 -06:00
GriffinR
a38bff8c17 Document Slateport scripts 2019-11-09 08:37:06 -06:00
GriffinR
1174a20a17 Document Fallarbor and Verdanturf scripts 2019-11-09 08:37:06 -06:00
huderlem
906a1ec4ab
Merge pull request #883 from GriffinRichards/fix-colossname
Fix Battle Colosseum names
2019-11-08 17:24:05 -06:00
GriffinR
9140594b23
Merge branch 'master' into doc-littleroot 2019-11-08 03:07:50 -05:00
GriffinR
e19b9c9d46 Resolve Littleroot merge conflict 2019-11-08 03:07:19 -05:00
GriffinR
bef24a45f0 Document Littleroot scripts 2019-11-08 02:47:55 -05:00
huderlem
030784dece
Merge pull request #882 from GriffinRichards/doc-mauville
Document Mauville and New Mauville scripts
2019-11-07 20:22:56 -06:00
huderlem
1ceee6ef70
Merge pull request #884 from GriffinRichards/doc-halloffame
Document a few towns/cities
2019-11-07 19:55:19 -06:00
GriffinR
4334e31a7e Fix sailing typo 2019-11-07 16:46:56 -05:00
GriffinR
5e4dd022a6 Document Dewford scripts 2019-11-07 16:36:48 -05:00
GriffinR
5d35662c4c Document Pacifidlog scripts 2019-11-07 15:41:42 -05:00
GriffinR
de933000e3 Document Lavaridge scripts 2019-11-07 15:21:32 -05:00
GriffinR
979ece7d56 Document Fortree scripts 2019-11-07 14:49:52 -05:00
GriffinR
03a7995570 Move hall of fame script 2019-11-07 13:28:33 -05:00