Commit graph

3368 commits

Author SHA1 Message Date
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
Slawter666
8b1595ebc3 Pokédex search menu documentation 2020-01-06 15:18:58 -06:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
GriffinR
379f7f5149 Add braces to trainer party moves 2020-01-06 15:16:49 -06:00
GriffinR
bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
Marcus Huderle
ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5
Give rival and Maxie parties better names
2019-12-28 12:06:35 -06:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
Fontbane
2e8c20d72f Update trainers.h 2019-12-25 20:48:40 -05:00
huderlem
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse
Document item_use.c
2019-12-25 11:59:07 -06:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower
Document Battle Tower scripts
2019-12-25 11:39:20 -06:00
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names
Name describes where the battle is and for rivals, which starter the player chose.
2019-12-23 10:42:06 -05:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
Diegoisawesome
773a599bbb
Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo
'real' match DrawTradeMenuPartyInfo
2019-12-20 15:49:14 -08:00
jiangzhengwenjz
4d8ea3a2d9 CanSpinTradeMon 2019-12-21 06:18:20 +08:00
jiangzhengwenjz
681d929892 DrawTradeMenuPartyInfo 2019-12-21 06:09:59 +08:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05: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
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush
berry crush
2019-12-17 19:35:00 -06:00
GriffinR
4879c1eab2
Merge branch 'master' into constants-fade 2019-12-17 19:11:51 -05:00
jiangzhengwenjz
420b4b3fea use STR_CONV_MODE_* constants 2019-12-18 06:42:53 +08:00
jiangzhengwenjz
5bec27aa34 nonmatch sub_8024604 2019-12-18 03:36:51 +08:00
jiangzhengwenjz
67690df65f sub_8023CAC 2019-12-17 23:12:01 +08:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
jiangzhengwenjz
50c48d7ef6 sub_8023BC0 2019-12-17 14:49:57 +08:00
jiangzhengwenjz
efa1ee1822 sub_8022250 2019-12-16 14:17:29 +08:00
jiangzhengwenjz
3f858c1c26 sub_8022F04 2019-12-16 14:17:29 +08:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj 2019-12-15 11:47:27 -05: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
a04347816f Split PokenavMatchCallEntries from PokenavMonList 2019-12-15 10:25:47 -05:00
GriffinR
82f55f2381 Merge master into ObjEvent rename 2019-12-15 02:00:00 -05:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
ea9a2c848a Define start and ends for temp vars and daily/temp/special flags 2019-12-14 08:27:49 -06:00
GriffinR
09840efc64 Name last event_data funcs 2019-12-14 08:27:49 -06:00
GriffinR
1a672dac8d Use constant for daily flag offset 2019-12-14 08:27:49 -06:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05: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
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
8da7a94423
Merge branch 'master' into fix-eventobj 2019-12-10 17:41:08 -05:00
Diegoisawesome
49b56d0136
Merge pull request #929 from jiangzhengwenjz/nonmatching
fake match InitEventObjectStateFromTemplate
2019-12-10 14:32:57 -08:00
jiangzhengwenjz
f34b8f564a InitEventObjectStateFromTemplate 2019-12-11 05:35:40 +08:00
GriffinR
77bf40d32b Fix modern build for #925 2019-12-08 16:57:09 -05:00
GriffinR
51179df017 Clean up match call doc 2019-12-08 15:49:36 -05:00
GriffinR
0086cd1efa More pokenav match call documentation 2019-12-08 15:25:21 -05:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
Slawter666
47ea65b96e Requested changes 2019-12-06 19:06:21 -06:00
Slawter666
9fc176f272 Document pokedex info page 2019-12-06 19:06:21 -06:00
GriffinR
05af6b467c Fix Subsprite formatting 2019-12-06 19:05:44 -06:00
GriffinR
c26e8b8ddb More SPRITE macro usage 2019-12-06 19:05:44 -06:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR
22fd579fd9 Add comment for ABNORMAL_WEATHER 2019-12-06 19:05:28 -06:00
GriffinR
7f22fc9879 Update old weather names in field_weather_effect 2019-12-06 19:05:28 -06: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
1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR
cc9b923dc2 More pokenav match call documentation 2019-12-06 02:35:08 -05:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05: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
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -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
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
GriffinR
cfdde42b00 Name text speed delays 2019-11-25 09:16:05 -06:00
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3
battle_anim_effects_3
2019-11-24 12:02:54 -06:00
Sewef
07b79c3fc3 battle_anim_effects_3 (5) 2019-11-24 18:00:51 +01:00
huderlem
bef6150b59
Merge pull request #909 from GriffinRichards/doc-apprentice
Document Apprentice
2019-11-23 09:27:02 -06:00
GriffinR
f039e897ca Use APPRENTICE_COUNT for record_mixing mod 2019-11-23 10:11:05 -05:00
Sewef
1dfe34dee3 TriForce → TriAttack 2019-11-23 15:51:08 +01:00
Thomas Winwood
e3f7f47321 Turn some magic numbers into named constants 2019-11-23 07:53:26 -06: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
8910739d8c Rename mapObect to objectEvent 2019-11-21 01:40:38 -05:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
GriffinR
7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -05:00
GriffinR
98b81722e7 Rename field_objet_palettes 2019-11-20 23:54:22 -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
81507fc8b7 Move Apprentice data 2019-11-20 19:04:25 -05:00
GriffinR
b2eb49888d Clean up Apprentice doc 2019-11-20 19:00:08 -05:00