Commit graph

5500 commits

Author SHA1 Message Date
AJ Fontaine
2e7c21e528
Vise Grip to Vice Grip
The weird thing is "vice" is the British way of saying it and "vise" is the American way, but the change happened in games based on the UK. Now matches its Gen 7 name.
2019-12-14 17:01:33 -05:00
AJ Fontaine
25434b5179
Change move names to CamelCase
To match with Gen 4 and 5. "Vicegrip" was changed to "Vice Grip" in Gen 6 and then "Vise Grip" in Gen 8, so I changed it to "Vise Grip".
2019-12-09 11:09:57 -05:00
DizzyEggg
9b459eb64a Fix atk49state 2019-12-09 08:41:09 +01:00
DizzyEggg
740ab29c7c
Merge pull request #204 from cfmnephrite/beta
Dancer
2019-12-09 08:36:22 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
Nephrite
0343f63eda Dancer
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-12-07 10:19:01 +00: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
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
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
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +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
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
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
88244463e9 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-22 22:50:03 +01:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
81507fc8b7 Move Apprentice data 2019-11-20 19:04:25 -05:00