ultima-soul
2d3ba500c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2022-03-01 15:10:19 -08:00
sphericalice
40efac0ddf
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
2022-02-22 19:13:17 +00:00
GriffinR
30d9704418
Specify unsigned in spot comment
2022-01-17 17:27:17 -05:00
GriffinR
313f14ed63
Add Spinda spot color constants
2022-01-17 17:00:18 -05:00
GriffinR
177863da47
Fix typo
2022-01-17 16:04:02 -05:00
GriffinR
225147a94f
Document Spinda spot algorithm
2022-01-17 15:34:18 -05:00
GriffinR
d4111d5520
Add comment about pokedex reordering
2022-01-05 14:50:19 -05: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
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
ultima-soul
d0623d7b71
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-27 21:40:08 -08: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
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05:00
GriffinR
c4169cfd29
Disambiguate cry functions
2021-11-07 14:26:09 -05:00
GriffinR
7f49f26331
Restore ModifyStatByNature bug notes
2021-10-27 22:38:48 -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
b8a44bf10a
Calculate pokemon substruct size, missing MON_PIC_SIZE
2021-10-11 10:35:53 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
ultima-soul
06f36595d6
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-10-05 19:25:52 -07:00
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02:00
Eduardo Quezada D'Ottone
4fbe4da7d0
Sitrus Berry Gen4+ heal. Credit to SBird1337
2021-09-26 18:46:34 -03:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04: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
53e900a643
Rearranged rest of item ids except for Key Items.
2021-07-02 22:43:50 -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
Eduardo Quezada D'Ottone
76b99e66dc
Added missing Treecko from animation list.
2021-05-16 20:46:58 -04:00
ultima-soul
00c3f060b1
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 23:53:23 -07: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
bee60f4c64
Document battler sprite affine anims, default pokeball throw
2021-04-25 02:18:34 -04:00
GriffinR
e5f0d2f736
Doc storage - releasing, some cursor
2021-04-16 04:30:09 -04:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim
...
Document Pokémon animation
2021-04-13 01:36:15 -04:00
GriffinR
72ba8cf58d
Document pokemon animation types
2021-04-10 00:50:28 -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
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
a5852d57d1
Use TASK_NONE constant
2021-02-24 11:03:25 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons
...
Document some ribbon usage
2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
...
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
GriffinR
15906ca143
Document evolution scene
2021-02-03 17:55:37 -05:00
