LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
ultima-soul
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -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
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
1b35f9adad
Use specific name limits for string limit functions
2021-11-17 22:11:03 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
65d3b58374
Add PARTY_NOTHING_CHOSEN
2021-11-15 10:57:06 -05:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu
2021-11-04 12:11:31 -04:00
GriffinR
c291fa8e7f
Propagate BG_COORD constants
2021-11-03 23:02:06 -04:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
085f8adec6
Start remaining menu documentation
2021-11-03 17:38:08 -04:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc
2021-11-03 13:56:22 -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
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
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
901cd476b6
Fix incorrect arguments on CopyRectToBgTilemapBufferRect
2021-10-29 11:51:47 -04:00
GriffinR
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04: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
af5ff05338
Fixed FORM_ITEM_HOLD_ABILITY check
2021-10-05 21:25:56 -03: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
ce867cd0e0
Remove unused species variable from TryItemUseFormChange functions.
2021-10-03 10:58:14 -07: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
Eduardo Quezada D'Ottone
55b61313a4
PSS uses form change table for holding items.
...
# Conflicts:
# src/pokemon.c
2021-09-29 02:13:44 -03:00
Eduardo Quezada D'Ottone
fdd284b50b
Hold Item party menu
2021-09-29 02:06:03 -03: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
LOuroboros
87bc1f502a
Fixed form icon subpriority
2021-09-25 19:58:12 -03: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
DizzyEggg
4c9660bff1
Merge pull request #1579 from ghoulslash/embargo
...
Add Embargo Effect
2021-09-08 20:03:08 +02: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
ultima-soul
988320b89a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07:00
ultima-soul
840e2bc3f9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-16 16:33:34 -07: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
b620349da0
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-16 15:43:27 -07:00
ultima-soul
64a48800c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -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
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -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
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc
2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8
Document player pc
2021-08-02 13:58:40 -04:00
ghoulslash
eadd09bebd
block item use under embargo
2021-07-25 07:39:02 -06:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
2d8d38f44c
Add TM51 through TM100.
2021-07-05 18:11:57 -07:00
ultima-soul
53e900a643
Rearranged rest of item ids except for Key Items.
2021-07-02 22:43:50 -07:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
ultima-soul
cf0fd961b9
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 23:56:58 -07: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
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -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
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
8c820878bf
Document Battle Pyramid Bag
2021-04-23 15:07:36 -04:00
GriffinR
838a452363
Doc storage - choose box menu, move wallpaper gfx
2021-04-15 18:46:20 -04:00
Kurausukun
3e725272fc
standardize "grey" to "gray"
2021-04-09 22:39:34 -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
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
ultima-soul
7abfe7469a
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07: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
b9c733495b
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -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
81a7f491b7
Use WINDOW_NONE constant
2021-02-24 11:03:08 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
...
Document PokemonUseItemEffects
2021-02-22 12:15:19 -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
ultima-soul
46e853c13b
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:06:48 -08:00
ultima-soul
5fdb578747
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE
...
Reworked the effects of the X Items #1
2021-01-15 12:05:07 -06:00
GriffinR
f63bc6e27a
Index sTMHMMoves
2021-01-14 03:41:28 -05:00
ultima-soul
3cb09b6507
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
2021-01-11 15:19:11 -08:00
GriffinR
eba7933c0c
Remove unnecessary subtraction in switch
2021-01-04 19:50:05 -05:00
LOuroboros
dbc3690282
Tweaked preprocessor directives
...
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
2021-01-04 03:58:31 -03:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
ExpoSeed
10f4b48215
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
ExpoSeed
208e0abe04
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2020-12-31 18:44:43 -06:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
LOuroboros
791d561f14
Reworked the effects of the X Items
...
Thanks to Karathan's indications.
2020-12-08 18:24:42 -03:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
8d86169283
Merge remote-tracking branch 'pret/master' into IE-pretSync
2020-11-07 14:54:52 -03:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
