Commit graph

847 commits

Author SHA1 Message Date
GriffinR
8e424b6985
Merge branch 'master' into doc-binterface 2021-11-09 16:09:48 -05:00
GriffinR
684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
GriffinR
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
cbt6
0fe3881961 Rename WalkInPlaceFastest to WalkInPlaceFaster 2021-11-05 01:54:34 +08:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans
Document battle transition
2021-11-03 11:26:20 -04:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6
4cedd2d551 Rename WalkFastest functions to WalkFaster 2021-11-03 01:50:53 +08:00
Eduardo Quezada D'Ottone
f3013d8ee9 Standarized Solarbeam into Solar Beam 2021-11-01 18:36:35 -03:00
cbt6
9a1764f83e Label some animation index numbers 2021-10-30 01:37:49 +08:00
GriffinR
07bf225f94 Continue battle_transition documenting 2021-10-29 11:24:36 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
GriffinR
4f7f6c1082
Merge pull request #1526 from sphericalice/doc-curtain-special
Document the CloseBattlePikeCurtain special
2021-10-25 16:10:45 -04:00
ghoulslash
07d2f73306
Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball
Config for Shedinja needing a Poké Ball to be created
2021-10-25 15:49:25 -04:00
sphericalice
120e75d275 Document the CloseBattlePikeCurtain special 2021-10-25 18:03:14 +01:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
7a89ad98c3 Document record mixing hall records 2021-10-24 16:13:07 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
Eduardo Quezada D'Ottone
35d5bc4367 Config for Shedinja needing a Poké Ball to be created 2021-10-22 20:50:53 -03:00
GriffinR
303ce856ad Fix GET_CARD_BATTLE_LOST typo 2021-10-21 16:54:16 -04:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
Miscellaneous battle documentation
2021-10-19 08:09:17 -04:00
GriffinR
24b4e898ad More mauville_old_man clean up 2021-10-18 14:40:04 -04:00
GriffinR
b31bddddca Clean up metatile_behavior 2021-10-18 12:54:29 -04:00
GriffinR
db8ce5d7f9 Clean up mauville_old_man, drop ScrSpecial prefix 2021-10-18 01:09:41 -04:00
GriffinR
ece7ef3410 Correct usage of MysteryEvent to MysteryGift 2021-10-17 03:00:48 -04:00
GriffinR
3cd27acbea Document wonder news 2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d Clean up mevent2 2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c Clean up wonder card/news view 2021-10-17 01:15:16 -04:00
GriffinR
845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle 2021-10-15 22:46:43 -04:00
GriffinR
1f39c34ca4
Merge branch 'master' into minor-constants 2021-10-15 22:44:49 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union
Document link_rfu / Union Room
2021-10-15 22:44:01 -04:00
GriffinR
c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
GriffinR
95406384f4 Start wonder card/news documenting 2021-10-14 13:24:20 -04:00
GriffinR
9ab03f454d Small correction to map script comments 2021-10-13 23:24:10 -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
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
GriffinR
862febe03a Add MAP_OFFSET 2021-10-09 13:19:27 -04:00
GriffinR
d8e65fc4b6 More battle doc, add battle window ids 2021-10-09 03:01:10 -04:00
LOuroboros
2a7d78e68b Oopsie 2021-10-09 01:55:36 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
GriffinR
6aaf50ee27 Rename GF Gname, Rfu, finish bulk of Union Room, more link doc 2021-10-07 10:43:03 -04:00
Eduardo Quezada D'Ottone
2b54b48b04 Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems
# Conflicts:
#	src/pokemon.c
2021-10-05 21:13:36 -03:00
ultima-soul
78d2215196 Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding. 2021-10-03 10:16:09 -07:00
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
5593a83783 Fixed compile 2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone
5bf300f97c Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE 2021-09-30 22:12:02 -03:00
Pokestia
38a4dea402 Rename Battle Weather flags 2021-09-30 12:08:20 +02:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
2021-09-25 22:00:10 -03:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
Form change table
2021-09-22 00:04:26 -03:00
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -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
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
LOuroboros
8012f4b25a Re-ordered the hidden item flags list
Instead of sorting them by location, it makes more sense to sort them by their value.
2021-07-26 20:18:11 -03:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ExpoSeed
788b9f675f Fix redefinition error in pokemon_config.h 2021-07-02 14:36:02 -05:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
Scott
265cdcdc12 Handle GetAbilityBySpecies edge cases 2021-05-23 16:17:43 -04:00
ultima-soul
50c2514267
Merge pull request #1469 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-05-13 20:56:29 -07:00
GriffinR
65fd334256 Name map groups 2021-05-11 10:16:04 -05:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
Document TV
2021-04-29 00:25:01 -04:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp
Sync e-reader helpers, document trainer hill e-reader
2021-04-28 06:08:57 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
ExpoSeed
db2b995bc6 Introduce NUM_ABILITY_SLOTS 2021-04-16 23:37:55 -05:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim
Document Pokémon animation
2021-04-13 01:36:15 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
Document field
2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc
Clean up battle scripts
2021-04-10 12:41:35 -04:00
GriffinR
72ba8cf58d Document pokemon animation types 2021-04-10 00:50:28 -04:00
GriffinR
4a1cfbead2 Document remaining overworld 2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05: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
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00