Commit Graph

3804 Commits

Author SHA1 Message Date
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