Commit Graph

1785 Commits

Author SHA1 Message Date
GriffinR
df1fce705c Fix hard-coded string ptr 2019-11-29 00:10:55 -05:00
GriffinR
cb90f22c5e Merge master into ObjEvent rename 2019-11-27 12:51:10 -05:00
GriffinR
8d870d94c9 Document Battle Arena scripts 2019-11-26 18:47:48 -06: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
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
GriffinR
4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05: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
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
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
GriffinR
bae4a586d8 Document Hall of Fame scripts 2019-11-07 13:26:53 -05:00
GriffinR
35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR
09afa7992d Document Shoal Cave 2019-11-07 12:17:28 -05:00
GriffinR
d5685db19a Fold nops into hidemoneybox 2019-11-07 10:37:15 -05:00
GriffinR
0b5c2c2721 Document New Mauville scripts 2019-11-07 10:32:21 -05:00
GriffinR
c132989679 Document Mauville scripts 2019-11-07 10:18:56 -05:00
GriffinR
43b7fd741a Document Game Corner scripts 2019-11-07 09:41:59 -05:00
GriffinR
3a00b66407 Document cave scripts 2019-11-07 07:57:51 -05:00
GriffinR
2b944fd721
Merge branch 'master' into doc-trickhouse 2019-11-06 19:49:14 -05:00
GriffinR
25d026aded Document Trick House scripts 2019-11-06 19:41:19 -05:00
GriffinR
1475c4d8da Document other cable car station 2019-11-06 17:01:23 -06:00
GriffinR
fbc3eee1f2 Document Fossil Maniac and Berry Master route houses 2019-11-06 17:01:23 -06:00
GriffinR
7d5d12877e Document cycling, cable car, and tunneler route houses 2019-11-06 17:01:23 -06:00
GriffinR
d0198088d9 Document Lanettes, Winstrates, Old Ladys, and Wingull houses 2019-11-06 17:01:23 -06:00
GriffinR
903b8060a7 Document Glass Workshop 2019-11-06 17:01:23 -06:00
GriffinR
dba94e3971 Update fldeff sparkle macro 2019-11-06 16:41:56 -06:00
GriffinR
6730df2321 Document Abandoned Ship scripts 2019-11-06 16:41:56 -06:00
GriffinR
37bd93ec6c Rename mystery event msg scripts 2019-11-06 16:38:02 -06:00
GriffinR
e7f6459a89 Split mystery event msg 2019-11-06 16:38:02 -06:00
GriffinR
58dcd6d99d Clean up mystery event msg 2019-11-06 16:38:02 -06:00
GriffinR
481c09fcad Clean up Rustboro script doc 2019-11-05 16:43:57 -06:00
GriffinR
d9da932dad Document Rustboro scripts 2019-11-05 16:43:57 -06:00
GriffinR
1d421f2f71 Document Devon Corp scripts 2019-11-05 16:43:57 -06:00
GriffinR
5ef300c10b Document dept store 2019-11-04 16:49:06 -06:00
GriffinR
5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
GriffinR
290df23130 Document remaining poke marts 2019-11-04 16:42:28 -06:00
GriffinR
878eb523d7 Document remainder of poke centers 2019-11-04 16:42:28 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds
Rename table cmds
2019-11-04 16:31:27 -06:00
GriffinR
347d1e20b6 Use constants in io_reg.s 2019-11-04 16:26:09 -06:00
GriffinR
033c6cea3b Use YES/NO constants for MSGBOX_YESNO 2019-11-02 16:36:43 -05:00
GriffinR
a90b828bb8 Use YES/NO constants 2019-11-02 16:32:58 -05:00
GriffinR
e4fe21786e Document misc special houses 2019-11-02 16:32:58 -05:00
GriffinR
390d594e21 Fix indentation 2019-11-01 17:22:45 -05:00
GriffinR
5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR
dd01942c4f Document aqua/magma hideout scripts 2019-11-01 17:22:45 -05:00
huderlem
6eaac9ea9d
Merge pull request #863 from GriffinRichards/doc-partymenu
Document party menu
2019-10-31 21:36:56 -05:00
GriffinR
8055548fa4 Document legendary scripts 2019-10-31 18:28:34 -05:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
67ce8c9cc2 Clean up players_house doc 2019-10-30 17:51:35 -05:00
GriffinR
93e2851fc1 Document players_house.inc and Littleroot house scripts 2019-10-30 17:51:35 -05:00
Marcus Huderle
aad430c049 Document route 110 scripts 2019-10-26 12:55:53 -05:00
Marcus Huderle
8b75d977e3 Document seashore house scripts 2019-10-26 12:55:53 -05:00
Marcus Huderle
13f9760187 Document route 109 scripts 2019-10-26 12:55:53 -05:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
f35a3f73b2 Document gabby_and_ty.inc 2019-10-26 09:32:04 -05:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
Marcus Huderle
83d0a87d0c Document several route scripts 2019-10-24 20:14:11 -05:00
GriffinR
7d24f2d62c Document record_mix.inc and clean surf.inc 2019-10-22 17:57:28 -05:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
GriffinR
9a86769847 Document obtain_item.inc 2019-10-22 17:57:28 -05:00
GriffinR
c0aaa01424 Document flash.inc 2019-10-22 17:57:28 -05:00
Marcus Huderle
4fd848e689 Document early route scripts 2019-10-22 16:47:19 -05:00
GriffinR
a4d6ce417d Fix resetintimidatetracebits typo 2019-10-22 15:54:11 -05:00
GriffinR
fa4940ee44 Clean up lilycove_lady.inc doc 2019-10-21 20:19:37 -05:00
GriffinR
6923f0e369 Document lilycove_lady.inc 2019-10-21 20:19:37 -05:00
GriffinR
a7ffa96578 Rename mart_attendant to mart_clerk 2019-10-21 17:22:19 -05:00
GriffinR
c70162086b Split some smaller files from event_scripts 2019-10-21 17:22:19 -05:00
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
Marcus Huderle
2f36bd62d7 Document Oldale scripts 2019-10-21 16:44:20 -05:00
Sewef
64cf2d70fa battle_anim_effects_3 (3) 2019-10-21 18:36:45 +02:00
Sewef
b24e7a5933 battle_anim_effects_3 (2) 2019-10-21 18:29:59 +02:00
Sewef
c8e0e89f8e battle_anim_effects_3 2019-10-21 18:19:07 +02:00
Sewef
afdc8da297 Update battle_anim_scripts.s 2019-10-21 18:06:36 +02:00
Marcus Huderle
04ea8eea5a Document rest of Petalburg scripts 2019-10-20 12:36:35 -05:00
Sewef
41e952a668 battle_anims_effects_2
Fixes
2019-10-20 12:29:08 -05:00
Sewef
e9675bdd24 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
def7a4a18a more battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
8531a17e10 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
e90c708383 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
3b0d9e134f battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
49ad6da8fb starting battle_anim_effects_2 2019-10-20 12:29:08 -05:00
GriffinR
ac399ade4a Document safari zone scripts 2019-10-20 09:53:21 -05:00
GriffinR
0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00
Marcus Huderle
cefc31dd1e Document Petalburg City scripts 2019-10-19 15:05:15 -05:00
huderlem
cb9f89925f
Merge pull request #841 from GriffinRichards/document-gyms2
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
2019-10-19 08:05:11 -05:00
Sewef
19fb0fb220
Merge branch 'master' into patch-2 2019-10-16 19:35:33 +02:00
Sewef
9dcfc5ba73 Fix labels 2019-10-16 19:10:39 +02:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR
20fa13616f Condense fallthrough script 2019-10-16 04:14:51 -04:00
GriffinR
0f15264595 Document rotating_tile_puzzle 2019-10-16 04:09:30 -04:00
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
GriffinR
90a05cf824 Finish Mossdeep Gym doc, beging documenting rotating tile puzzle 2019-10-15 05:06:13 -04:00
GriffinR
1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04: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
Sewef
975c0ce1d0 Label battle_anim_effects_1 2019-10-14 23:27:12 +02:00
Sewef
65b82d67c9 Revert "More battle_anim_effects_1 labels"
This reverts commit 00331a644a.
2019-10-14 23:22:44 +02:00
Sewef
5a366e8d72 More battle_anim_effects_1 labels 2019-10-14 22:51:45 +02:00
Sewef
00331a644a More battle_anim_effects_1 labels 2019-10-14 22:42:15 +02:00
Sewef
299166edee Document subs & AnimTask in battle_anim_effects_1 2019-10-14 22:08:03 +02:00
Sewef
46f2cc5449 battle_anim_effects_1 main callbacks 2019-10-14 21:17:38 +02:00
Sewef
63b5be9259 Ended battle_anims_effects_1 SpriteTemplates 2019-10-14 21:05:40 +02:00
Sewef
a49756a8fe Update battle_anim_scripts.s 2019-10-13 22:37:39 +02: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
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
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
GriffinR
02070eaf73 Document kecleon 2019-10-06 16:06:34 -04: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
GriffinR
749247b910 Convert 4 spaces in .inc to tab 2019-10-05 10:52:48 -04:00
GriffinR
dadb1cb9f1 More trade/union room doc, incidental party_menu doc 2019-10-04 23:31:25 -04:00
GriffinR
c3c8fb40cf Move trade data, some trade.c clean up documentation 2019-10-03 01:16:22 -04:00
GriffinR
2ac3ad3e60 Review changes for #819 and merge 2019-10-02 12:40:00 -04:00
PikalaxALT
cb528cb543
Merge pull request #821 from GriffinRichards/document-textinput
Document text input strings
2019-10-02 09:49:26 -04:00
GriffinR
9aed405851 Document a few field specials 2019-09-30 01:42:52 -04:00
GriffinR
53bc1bd0d1 Document text input strings 2019-09-30 00:09:29 -04:00
GriffinR
67152b9242 Split off more files from event_scripts 2019-09-28 02:37:01 -04:00
GriffinR
75869a880c Move running shoes script 2019-09-27 15:27:08 -04:00
GriffinR
12cc7ef34c Split more files from event_scripts 2019-09-27 14:20:51 -04:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
GriffinR
86f1f9066a Split some files from event_scripts 2019-09-27 12:22:58 -04:00
GriffinR
0c1f1281da Review changes for #778 2019-09-27 10:08:47 -04:00