11596 Commits

Author SHA1 Message Date
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
GriffinR
734a15135f Clean up a few unlabeled scripts 2021-03-04 19:30:19 -06:00
ExpoSeed
dd73d8fc06 Fix wrong comment 2021-03-03 16:47:31 -06:00
ExpoSeed
08bd8f8403 Support form changes with PE 2021-03-03 15:34:22 -06:00
ExpoSeed
f49da96f1d Fix consumable item form change 2021-03-03 15:24:58 -06:00
ExpoSeed
07af84db8a Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea 2021-03-03 13:54:25 -06:00
GriffinR
69f7882b5e Label missed pokemon jump anims 2021-03-03 14:32:09 -05:00
GriffinR
b9c733495b Document dodrio berry picking 2021-03-03 14:26:05 -05:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
Evan
41d47a867e format fixes 2021-03-03 10:48:57 -07:00
ghoulslash
f83e8b4f94
Update src/battle_message.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:17 -07:00
ghoulslash
5207d48b21
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:11 -07:00
ghoulslash
6739433e9e
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:05 -07:00
ghoulslash
64e3f7dc24
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:47:59 -07:00
Evan
791fd5e709 finish berry hold effects 2021-03-03 09:25:25 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
99c8bd19ca
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:25 -07:00
ghoulslash
3edb7ede29
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:20 -07:00
ghoulslash
43ec4e1041
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:14 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:07 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:00 -07:00
ghoulslash
63b1a02c28
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:56 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:49 -07:00
ExpoSeed
f7d42cd3c8 Formatting 2021-03-02 14:25:15 -06:00
ExpoSeed
aac7028703 Add newline at end of file 2021-03-02 14:21:29 -06:00
ExpoSeed
6db5a98ad9 Delete old form change table 2021-03-02 14:20:39 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7e8659c4ee Fix missed merge conflict 2021-03-02 14:17:48 -06:00
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
Evan
fe6ce33718 fix AnimTask_GetLycanrocForm 2021-03-01 17:37:05 -07:00
Evan
847700fbb6 fix GetIllusionMonPtr 2021-03-01 17:14:56 -07:00
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
ghoulslash
26ada22762
Update src/battle_z_move.c
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-03-01 16:38:54 -07:00
ghoulslash
fa32603e73
Update src/battle_z_move.c
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-03-01 16:38:49 -07:00
ghoulslash
d686bab213
Update src/battle_z_move.c
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-03-01 16:38:41 -07:00
ghoulslash
b663eb7188
Update src/battle_z_move.c
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-03-01 16:38:32 -07:00
ghoulslash
0ef91d4601
Update src/battle_z_move.c
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-03-01 16:36:39 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
ultima-soul
255a635237
Merge pull request #1295 from ghoulslash/terrain
Various Terrain Effects and Fixes
2021-03-01 10:38:36 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
55649a67cc Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain 2021-03-01 11:23:05 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns
Update tailwind timer To Gen5
2021-03-01 08:51:40 -08:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes
Magic Room Affects Macho Brace/Power Item Speed Drop
2021-03-01 08:50:59 -08:00
GriffinR
91ab30fa71 Rename mon markings struct 2021-02-28 17:11:46 -06:00
GriffinR
ed0347476c Remove old declaration and define 2021-02-28 17:11:46 -06:00
GriffinR
031da44cab Document mon markings 2021-02-28 17:11:46 -06:00
GriffinR
8bfd1370c9
Merge pull request #1352 from huderlem/GetOpponentMostCommonMonType
Document GetOpponentMostCommonMonType and fix its fake matching
2021-02-28 17:27:39 -05:00
Marcus Huderle
200e8214cf Document GetOpponentMostCommonMonType and fix its fake matching 2021-02-28 10:43:56 -06:00
GriffinR
cbc7a72814
Merge pull request #1346 from GriffinRichards/doc-pokejump
Document pokemon jump
2021-02-28 11:19:02 -05:00