Commit Graph

  • 49b56d0136 Merge pull request #929 from jiangzhengwenjz/nonmatching Diegoisawesome 2019-12-10 14:32:57 -08:00
  • f34b8f564a InitEventObjectStateFromTemplate jiangzhengwenjz 2019-12-11 05:34:56 +08:00
  • 77bf40d32b Fix modern build for #925 GriffinR 2019-12-08 16:57:09 -05:00
  • 51179df017 Clean up match call doc GriffinR 2019-12-08 15:49:36 -05:00
  • 0086cd1efa More pokenav match call documentation GriffinR 2019-12-07 04:08:21 -05:00
  • b93101bbeb Merge master into ObjEvent rename GriffinR 2019-12-06 21:37:17 -05:00
  • 47ea65b96e Requested changes Slawter666 2019-12-06 14:44:23 +00:00
  • 9fc176f272 Document pokedex info page Slawter666 2019-12-06 02:20:18 +00:00
  • 05af6b467c Fix Subsprite formatting GriffinR 2019-12-05 22:38:01 -05:00
  • c26e8b8ddb More SPRITE macro usage GriffinR 2019-12-04 22:26:43 -05:00
  • 2756771958 More usage of ST_OAM constants and SPRITE macros GriffinR 2019-12-04 21:00:45 -05:00
  • c40879aa36 Use ST_OAM constants for OamData definitions GriffinR 2019-12-04 15:25:13 -05:00
  • 22fd579fd9 Add comment for ABNORMAL_WEATHER GriffinR 2019-12-06 14:16:07 -05:00
  • 7f22fc9879 Update old weather names in field_weather_effect GriffinR 2019-12-06 13:25:45 -05:00
  • 955bfe3f5c Add comment for original weather name GriffinR 2019-12-06 10:43:18 -05:00
  • efaea2a3ab Revert WEATHER_CLOUDY to WEATHER_SHADE GriffinR 2019-12-06 02:27:58 -05:00
  • a4191040c9 Sync weather names GriffinR 2019-12-01 19:19:47 -05:00
  • 1b30f0c973 Rename event_obj_lock to event_object_lock GriffinR 2019-12-06 02:55:30 -05:00
  • cc9b923dc2 More pokenav match call documentation GriffinR 2019-12-05 22:34:55 -05:00
  • c51e0f3bae Merge branch 'master' into fix-eventobj GriffinR 2019-12-06 02:34:54 -05:00
  • 7beddd16dd Document missed scripts/text GriffinR 2019-12-04 13:10:39 -05:00
  • 49c6ae1ac6 Add some macro comments GriffinR 2019-12-02 15:26:56 -05:00
  • 467a103bcc Set up Battle Tent macros GriffinR 2019-12-02 14:49:22 -05:00
  • fdae25eab2 Set up Battle Pyramid macros GriffinR 2019-12-02 09:52:16 -05:00
  • 9fcfbdbef5 Set up Battle Factory macros GriffinR 2019-12-02 08:44:34 -05:00
  • 41c1c9ca8a Set up Battle Pike macros GriffinR 2019-11-29 02:00:19 -05:00
  • 9b3d1cfab6 Set up Battle Dome and Tower macros GriffinR 2019-11-28 22:46:39 -05:00
  • be17c1602d Set up remaining facility script doc, use Palace macros GriffinR 2019-11-28 21:09:35 -05:00
  • 548af3c0f1 Document a bit of Match Call GriffinR 2019-12-05 15:33:36 -05:00
  • 809811e722 Merge pull request #917 from GriffinRichards/fix-stringptr Diegoisawesome 2019-11-28 23:53:26 -06:00
  • df1fce705c Fix hard-coded string ptr GriffinR 2019-11-29 00:10:55 -05:00
  • c14e2cdbe2 Merge pull request #916 from Fontbane/patch-3 Diegoisawesome 2019-11-28 09:35:09 -08:00
  • 2d1a780dd8 Fix Hondrew Berry typo AJ Fontaine 2019-11-28 11:44:13 -05:00
  • cb90f22c5e Merge master into ObjEvent rename GriffinR 2019-11-27 12:51:10 -05:00
  • 70d1f54ab9 Remove TODO comment for battle arena macros GriffinR 2019-11-26 17:25:29 -05:00
  • 8d870d94c9 Document Battle Arena scripts GriffinR 2019-11-26 17:20:08 -05:00
  • f559fa3fe2 Merge master into ObjEvent rename GriffinR 2019-11-25 20:00:04 -05:00
  • 6efa51f8ad Bump discord invite PikalaxALT 2019-11-25 13:50:16 -05:00
  • 0db46e84bc Use macros for FRONTIER_DATA_6, fix offset comment GriffinR 2019-11-25 16:43:43 -05:00
  • cc81b5032b Split frontier macros and comment frontier_util.inc GriffinR 2019-11-25 14:19:17 -05:00
  • 63ee15fc28 Document Frontier Util GriffinR 2019-11-24 16:58:40 -05:00
  • 08a8dc46e3 Use macros for Trainer Hill GriffinR 2019-11-23 16:08:50 -05:00
  • 4dfa959fa2 Begin documenting Battle Pike and Frontier Util GriffinR 2019-11-20 21:46:29 -05:00
  • cfdde42b00 Name text speed delays GriffinR 2019-11-24 19:11:36 -05:00
  • 9a81661075 Merge pull request #851 from Sewef/patch-3 huderlem 2019-11-24 12:02:54 -06:00
  • 07b79c3fc3 battle_anim_effects_3 (5) Sewef 2019-11-24 18:00:51 +01:00
  • bef6150b59 Merge pull request #909 from GriffinRichards/doc-apprentice huderlem 2019-11-23 09:27:02 -06:00
  • f039e897ca Use APPRENTICE_COUNT for record_mixing mod GriffinR 2019-11-23 10:11:05 -05:00
  • 1dfe34dee3 TriForce → TriAttack Sewef 2019-11-23 15:51:08 +01:00
  • e3f7f47321 Turn some magic numbers into named constants Thomas Winwood 2019-11-20 16:37:14 +00:00
  • 2bf1e0600e Consolidate apprentice_buff macros GriffinR 2019-11-23 08:09:25 -05:00
  • 4f590e8f61 battle_anim_effects_3 (4) Sewef 2019-11-23 11:57:39 +01:00
  • 4c52cf9ed1 Fix event constant file names GriffinR 2019-11-21 14:03:35 -05:00
  • 86c08330c4 Fix Event Object include guards GriffinR 2019-11-21 14:03:11 -05:00
  • 5822dfca8d Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT GriffinR 2019-11-21 10:47:24 -05:00
  • 8910739d8c Rename mapObect to objectEvent GriffinR 2019-11-21 01:40:38 -05:00
  • 570881b119 Rename event_object directories GriffinR 2019-11-21 00:44:55 -05:00
  • 7034f59c14 Rename EventObj to ObjEvent GriffinR 2019-11-21 00:14:40 -05:00
  • 98b81722e7 Rename field_objet_palettes GriffinR 2019-11-20 23:54:22 -05:00
  • 82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT GriffinR 2019-11-20 23:12:51 -05:00
  • ec3e86f1d2 Standardize Event Object to Object Event GriffinR 2019-11-20 22:55:44 -05:00
  • 81507fc8b7 Move Apprentice data GriffinR 2019-11-20 19:04:25 -05:00
  • b2eb49888d Clean up Apprentice doc GriffinR 2019-11-20 19:00:08 -05:00
  • a05006421b Document Apprentice GriffinR 2019-11-20 17:36:52 -05:00
  • 215bb31d67 Clean up Trainer Fan Club doc GriffinR 2019-11-18 12:35:59 -05:00
  • 5c5c1836bb Document Trainer Fan Club GriffinR 2019-11-17 17:34:11 -05:00
  • c455fcfa59 Pokedex documentation Slawter666 2019-11-19 23:54:00 +00:00
  • 4e6a69c297 WIP Document Apprentice GriffinR 2019-11-19 11:36:38 -05:00
  • a486c8affd Begin documenting Apprentice, merge with master GriffinR 2019-11-18 12:45:56 -05:00
  • 5393b42f7c Remove SpriteCB_Null name GriffinR 2019-11-16 20:50:52 -05:00
  • f6ab6934ae Align battle tower func spacing GriffinR 2019-11-16 18:22:10 -05:00
  • 6ac7efb54f Document Scotts House and begin frontier macros GriffinR 2019-11-16 18:12:21 -05:00
  • f7e17ca985 Document Ranking Hall scripts GriffinR 2019-11-16 18:11:27 -05:00
  • d6e681066b Document Battle Frontier outside scripts GriffinR 2019-11-16 18:10:09 -05:00
  • 0dd73a03de Update comment for CheckFinalTime GriffinR 2019-11-16 13:54:50 -05:00
  • b96fad074b Rename neverRead fields GriffinR 2019-11-16 13:45:21 -05:00
  • 3bbdee61b8 Clean up Trainer Hill doc GriffinR 2019-11-13 16:31:01 -05:00
  • 5e01871f8b Document Trainer Hill GriffinR 2019-11-13 16:10:05 -05:00
  • 2c3726a328 Document contest strings GriffinR 2019-11-14 12:07:43 -05:00
  • 0513e05c38 Document Frontier Reception Gate GriffinR 2019-11-12 20:53:59 -05:00
  • 248b85c3cb Document Frontier Exchange Corner scripts GriffinR 2019-11-12 19:51:19 -05:00
  • dadaba3075 Fix bet amount typo GriffinR 2019-11-16 12:30:54 -05:00
  • 57a66bb22d Document Battle Frontier lounges GriffinR 2019-11-12 17:52:32 -05:00
  • 0a43f2ce53 Merge pull request #899 from GriffinRichards/doc-scriptclean huderlem 2019-11-16 11:34:47 -06:00
  • fc3783b739 WIP Document apprentice GriffinR 2019-11-14 18:56:18 -05:00
  • eb38922e42 Fix mislabeled SS Tidal movements GriffinR 2019-11-14 18:58:33 -05:00
  • 0f53aeb19b Document SS Tidal scripts GriffinR 2019-11-08 03:37:46 -05:00
  • ba65719090 Typo fix GriffinR 2019-11-12 11:09:49 -05:00
  • 00f22b6400 Document remaining routes (104, 119-123) GriffinR 2019-11-12 11:07:43 -05:00
  • 525ec2025d Document Routes 111-118 GriffinR 2019-11-12 01:57:39 -05:00
  • 0ba591d26f Document ocean routes GriffinR 2019-11-11 17:19:39 -05:00
  • ff7e11c0b0 Merge branch 'master' into doc-scriptclean GriffinR 2019-11-13 19:25:41 -05:00
  • ef8370566f Document Contest scripts GriffinR 2019-11-10 21:54:00 -05:00
  • af83b41dd1 Document Contest Hall berry blenders and misc GriffinR 2019-11-10 10:59:15 -05:00
  • c0ae1cbc1c Document Lilycove scripts GriffinR 2019-11-10 10:56:35 -05:00
  • bab1458cb4 Merge pull request #898 from DizzyEggg/imgp PikalaxALT 2019-11-12 15:26:25 -05:00
  • 7455bd9b9a Document interview and TV scripts, and misc script clean up GriffinR 2019-11-12 12:55:46 -05:00
  • e82fc06e08 Match ConvertImageProcessingToGBA DizzyEggg 2019-11-12 17:25:02 +01:00
  • 8e65f0188f Rename contest_painting_effects to image_processing_effects Marcus Huderle 2019-11-10 16:29:52 -06:00
  • 1ed3af66eb Document contest painting image processing effects Marcus Huderle 2019-11-10 12:46:39 -06:00