ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-24 20:30:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,952 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

314 Commits

Author SHA1 Message Date
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