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
|
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 |
|
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 |
|
N
|
6c07031c85
|
Remove redundant statements
|
2021-02-28 10:06:07 -06:00 |
|
N
|
cab3728e96
|
Strangest match
|
2021-02-28 10:06:07 -06:00 |
|
huderlem
|
10c77f1bc2
|
Merge pull request #1345 from GriffinRichards/doc-rtcscreen
Document/clean up some minor screens
|
2021-02-28 10:03:22 -06:00 |
|
Marcus Huderle
|
c900de35e7
|
Fix build and cleanup mistakes
|
2021-02-28 09:54:55 -06:00 |
|
Marcus Huderle
|
a85fada314
|
Document more battle anim effects
|
2021-02-28 09:54:55 -06:00 |
|
GriffinR
|
1912b0cf0a
|
Merge branch 'master' into doc-rtcscreen
|
2021-02-28 10:28:43 -05:00 |
|
GriffinR
|
3f59362397
|
Merge branch 'master' into doc-pokejump
|
2021-02-28 10:27:50 -05:00 |
|
GriffinR
|
ea748ff7f5
|
Merge pull request #1344 from GriffinRichards/doc-ec
Document easy chat and mail, script.c cleanup, add/use some general constants
|
2021-02-28 10:26:49 -05:00 |
|
GriffinR
|
70c560cc84
|
Merge pull request #1347 from huderlem/battle_anim_doc
Document some battle anim funcs and data
|
2021-02-27 13:50:01 -05:00 |
|
Marcus Huderle
|
c323e7f061
|
Document some battle anim funcs and data
|
2021-02-27 11:04:45 -06:00 |
|
GriffinR
|
763724a980
|
Shifts to mult in ShowBonus
|
2021-02-26 21:13:16 -05:00 |
|
GriffinR
|
117b90a261
|
Document pokemon jump
|
2021-02-26 17:26:39 -05:00 |
|
GriffinR
|
2dfa84c10f
|
Clean up berry_fix_program
|
2021-02-24 16:46:57 -05:00 |
|
GriffinR
|
f172ff84c9
|
Clean up save_failed_screen
|
2021-02-24 14:53:32 -05:00 |
|
GriffinR
|
f09278393e
|
Document reset_rtc_screen
|
2021-02-24 14:29:33 -05:00 |
|
GriffinR
|
293df1887f
|
Fix comment typo
|
2021-02-24 11:26:26 -05:00 |
|
GriffinR
|
b71b10623b
|
Add palette selection constants
|
2021-02-24 11:03:51 -05:00 |
|
GriffinR
|
c6141fea83
|
Document easy chat
|
2021-02-24 11:03:45 -05:00 |
|
GriffinR
|
1cac608dbe
|
Document mail
|
2021-02-24 11:03:39 -05:00 |
|
GriffinR
|
b04f0aaa2b
|
Use SPRITE_NONE constant
|
2021-02-24 11:03:32 -05:00 |
|
GriffinR
|
a5852d57d1
|
Use TASK_NONE constant
|
2021-02-24 11:03:25 -05:00 |
|
GriffinR
|
e52b46ab43
|
Clean up script.c
|
2021-02-24 11:03:17 -05:00 |
|
GriffinR
|
81a7f491b7
|
Use WINDOW_NONE constant
|
2021-02-24 11:03:08 -05:00 |
|
GriffinR
|
06ae5a37e2
|
Merge pull request #1336 from GriffinRichards/giftribbons
Document some ribbon usage
|
2021-02-24 10:07:59 -05:00 |
|