1693 Commits

Author SHA1 Message Date
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj 2019-12-15 11:47:27 -05:00
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
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
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
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
2a6e4e0a2a Merge with master 2019-12-09 08:29:10 +01:00
DizzyEggg
871e093b65 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-12-09 08:20:29 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05: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
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05: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
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
DizzyEggg
6e06b08c94 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-11-29 20:55:23 +01:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05: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
DizzyEggg
b70cde8f1b Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-11-22 23:11:17 +01:00
DizzyEggg
f3f9e47f96 Merge 2019-11-22 23:10:04 +01:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -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
a486c8affd Begin documenting Apprentice, merge with master 2019-11-18 12:47:10 -05:00
GriffinR
3bbdee61b8 Clean up Trainer Hill doc 2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328 Document contest strings 2019-11-16 12:50:01 -06:00
GriffinR
248b85c3cb Document Frontier Exchange Corner scripts 2019-11-16 12:00:35 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
GriffinR
ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
LOuroboros
884f542798 Fixed a typo and added entries for the Alolan Forms in src/pokemon.c 2019-11-13 14:29:26 -03:00
LOuroboros
8bde7eec1b Defined the animations for the front sprites of the Alolan Forms. 2019-11-13 13:00:31 -03:00
LOuroboros
cbc50eac50 Defined the paths of the sprites for the Alolan Forms. 2019-11-13 11:45:38 -03:00
LOuroboros
f47bc95990 Set the TM/HM learnsets for the Alolan Forms. 2019-11-12 22:38:13 -03:00
LOuroboros
788efccf79 Set the level up learnsets for the Alolan Forms. 2019-11-12 19:04:06 -03:00
LOuroboros
05013586d7 Set the evolution conditions for the Alolan Forms. 2019-11-12 18:25:28 -03:00
LOuroboros
1791ec28c9 Set the egg moves for the Alolan Forms. 2019-11-12 17:26:54 -03:00
LOuroboros
fecc6737e0 Added the Alolan Forms' base stats. 2019-11-12 16:58:44 -03:00
LOuroboros
5f24eb1f5e Set the InGame names for the Alolan Forms. 2019-11-12 14:36:42 -03:00
LOuroboros
8038389ad2 Added coordinates and entries for the Alolan Forms in the sprite data tables. 2019-11-12 13:07:00 -03:00