ultima-soul
2d3ba500c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2022-03-01 15:10:19 -08:00
LOuroboros
03205c995d
Update battle_script_commands.c
2021-12-24 01:59:40 -03:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75fa3bf5bc4018ce659e51a635d46b97, reversing
changes made to 349262ebc35abb090e51c689c74ee839713c83c6.
2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille
...
Add font id constants, better braille support
2021-11-03 13:17:29 -04:00
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
...
Miscellaneous battle documentation
2021-10-19 08:09:17 -04:00
GriffinR
f2e0c9ec9d
Some pokedex clean up
2021-10-17 21:32:09 -04:00
GriffinR
def6cc8158
Label battle script macro arguments
2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04:00
GriffinR
b0598b1aef
Clean up recorded_battle, add MOVE_IS_PERMANENT
2021-10-12 01:14:17 -04:00
GriffinR
28de627913
Add TRACKS_ALL, remove BGCntrlBitfield
2021-10-09 11:34:51 -04:00
GriffinR
d8e65fc4b6
More battle doc, add battle window ids
2021-10-09 03:01:10 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
ultima-soul
5cb73a012c
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-08-30 11:57:27 -07:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
53e900a643
Rearranged rest of item ids except for Key Items.
2021-07-02 22:43:50 -07:00
GriffinR
93188ef0a8
Fix divide by 0 in Cmd_getexp
2021-07-01 00:18:52 -04:00
ultima-soul
bca67ac683
Refactor Poke Ball code to not rely on Master Ball being the first item internally.
2021-06-11 18:22:50 -07:00
ultima-soul
b7706f1b99
Remove ball catch rate modifier effects.
2021-06-10 21:59:13 -07:00
ultima-soul
d30ab7760f
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-06-07 13:52:08 -07:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts ( #1436 )
2021-05-23 09:35:03 -05:00
ultima-soul
75a9fdbafa
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 20:50:59 -07:00
GriffinR
cd2a99b7c4
Doc storage - misc cleanup, some item/cursor
2021-04-17 13:33:29 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc
...
Clean up battle scripts
2021-04-10 12:41:35 -04:00
Kurausukun
3e725272fc
standardize "grey" to "gray"
2021-04-09 22:39:34 -04:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
ultima-soul
4a81102a46
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-02 13:57:19 -07:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
GriffinR
8c6e89e994
Bit shifts from hex to decimal
2021-03-30 17:38:09 -04:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-03-23 18:41:53 -07:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
ultima-soul
5fdb578747
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-02-01 15:58:18 -08:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
ExpoSeed
208e0abe04
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2020-12-31 18:44:43 -06:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00