Commit Graph

5436 Commits

Author SHA1 Message Date
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
955bfe3f5c Add comment for original weather name 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
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
1a5c610b5c
Merge pull request #206 from LOuroboros/alolan_forms
Alolan Forms
2019-11-30 15:35:12 +01:00
LOuroboros
ad7cda9169 Replaced the level up learnsets of the Alolan Forms with the same placeholder that many other new Pokémon use. 2019-11-30 09:29:30 -03:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
Diegoisawesome
809811e722
Merge pull request #917 from GriffinRichards/fix-stringptr
Fix hard-coded string ptr
2019-11-28 23:53:26 -06:00
GriffinR
df1fce705c Fix hard-coded string ptr 2019-11-29 00:10:55 -05:00
Diegoisawesome
c14e2cdbe2
Merge pull request #916 from Fontbane/patch-3
Fix Hondrew Berry typo
2019-11-28 09:35:09 -08: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
70d1f54ab9 Remove TODO comment for battle arena macros 2019-11-26 18:47:48 -06: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
PikalaxALT
6efa51f8ad Bump discord invite
New invite link points to landing channel
2019-11-25 18:38:13 -06:00
GriffinR
0db46e84bc Use macros for FRONTIER_DATA_6, fix offset comment 2019-11-25 18:37:48 -06:00
GriffinR
cc81b5032b Split frontier macros and comment frontier_util.inc 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
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
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
b70cde8f1b Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-11-22 23:11:17 +01:00
GriffinR
4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05:00
GriffinR
86c08330c4 Fix Event Object include guards 2019-11-21 14:03:11 -05:00
GriffinR
5822dfca8d Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT 2019-11-21 10:47:24 -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