Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

12991 Commits

Author SHA1 Message Date
ghoulslash
321634ed3b
Silk Trap Effect (#2512) 
* add silk trap effect, analog of obstruct

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-01-23 16:42:47 -03:00
Eduardo Quezada D'Ottone
fbcad9d3ec
Merge pull request #2572 from rh-hideout/AsparagusEduardo-patch-1 
Fixed Exp Candy S using the XS description
 2023-01-23 15:00:25 -03:00
Eduardo Quezada D'Ottone
1bfc922c72
Merge pull request #2471 from ghoulslash/be/gen9items 
Start Gen9 Hold Effects
 2023-01-23 14:58:08 -03:00
ghoulslash
8cc923ebcc parentheses around random & 1 2023-01-23 09:42:04 -05:00
Eduardo Quezada D'Ottone
2b22bdf1e7
Merge pull request #2579 from LOuroboros/allahu 
Fixed Explosion & Intimidate's 'interaction'
 2023-01-23 11:37:06 -03:00
ghoulslash
e93d22c0f1 optimize IsMoveMakingContact 2023-01-23 09:37:05 -05:00
ghoulslash
125e73dd07 loaded dice fix 2023-01-23 09:36:17 -05:00
ghoulslash
f97ec1975a merge w upcoming 2023-01-23 09:24:03 -05:00
TeamAquasHideout
af07c451d0 Fix Psycho Shift printfromtable Error 2023-01-23 05:01:55 -05:00
Jaizu
a7ce3974ad Apply feedback 2023-01-21 19:25:02 +01:00
Jaizu
c6811fb692 Ability popup fixes 2023-01-21 18:12:12 +01:00
ghoulslash
428ea97028 IsBattlerAlive instead of hp check 2023-01-21 12:11:12 -05:00
ghoulslash
a044084182 Remove redundant IsBattlerAlive checks from ITEMEFFECT_ORBS 2023-01-21 11:11:50 -05:00
ghoulslash
9e6c5725d0 add hp check to ITEMEFFECT_ORBS 2023-01-21 08:55:20 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
Eduardo Quezada
4a9515e8db Restored improvements from upstream 2023-01-20 12:34:15 -03:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
sbird
766964387e Merge branch 'master' into feature/dynmulti 2023-01-18 23:39:31 +01:00
sbird
bfc6619c03 [script-command, dynmultichoice] early expand placeholders 2023-01-18 23:34:27 +01:00
sbird
4fad6b3e12 [script-command, dynmultichoice] load message box and border gfx 2023-01-18 23:25:19 +01:00
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
GriffinR
4a9c4951ab
Merge pull request #1815 from tustin2121/patch-5 
Adding FindObjectEventPaletteIndexByTag bugfix
 2023-01-18 10:40:07 -05:00
GriffinR
a203c03eac Add bugfix to LoadObjectEventPalette 2023-01-18 10:33:39 -05:00
GriffinR
d68e81c2be Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
LOuroboros
773e7f0de2 Fixed Explosion & Intimidate's 'interaction' 2023-01-17 22:16:42 -03:00
sbird
a7cd4ca592 [script-command, dynmultichoice] implement event handler 2023-01-17 21:49:06 +01:00
sbird
276ce62d95 [script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back 2023-01-17 21:49:06 +01:00
sbird
569fa0a60a [script-command] add dynmultichoice 
* supports variable length arguments
 * automatically scrolls
 * supports building list menus from a stack
 2023-01-17 21:49:06 +01:00
GriffinR
d5a4bfcd6f
Merge pull request #1843 from GriffinRichards/colorize 
Colorize more grayscaled/incorrectly colored pngs
 2023-01-15 12:48:42 -05:00
Jaizu
a3ae182fc2
Add constants when using GetMonsStateToDoubles_2 2023-01-15 09:50:31 +01:00
GriffinR
c0e68f33f7 Colorize pokemon storage tiles 2023-01-15 00:39:51 -05:00
GriffinR
18384894e0
Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups 
Made Types and Egg Groups into arrays
 2023-01-15 00:27:20 -05:00
Eduardo Quezada
70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
GriffinR
387ea563fc Move FRLG trainer card gfx to own folder, fix tiles 2023-01-13 13:40:13 -05:00
GriffinR
1707f82992 Combine/colorize status graphics 2023-01-13 12:53:08 -05:00
Eduardo Quezada D'Ottone
6e1981369b
Fixed Exp Candy S using the XS description 2023-01-13 13:22:27 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
ghoulslash
c72274ee98
Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls 
Config for ball inheritence when breeding
 2023-01-13 09:35:15 -05:00
GriffinR
ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
Ariel A
244f3ceb15 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-01-12 21:58:39 -05:00
Ariel A
7b40e481ce Improved saving & loading expanded OWs. 2023-01-12 21:45:41 -05:00
Ariel A
3a0dc0f4f6 Reworked how OW pokemon's graphics are loaded. 2023-01-12 21:45:36 -05:00
Ariel A
5d5d97b46a Fixed most functions that take/return graphicsIds to accept u16s. 2023-01-12 21:44:56 -05:00
Eduardo Quezada
77cc407386 Review change 2023-01-12 23:44:34 -03:00
GriffinR
12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
GriffinR
5b3596108d Add some missing PARTY_SIZE usage 2023-01-12 10:51:20 -05:00
Bassoonian
3b4cba9b51
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-01-11 14:11:47 +01:00
Bassoonian
333917941b Add PLA+ obedience mechanics (with config) 2023-01-11 08:15:57 +01:00
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00