Eduardo Quezada
|
a044774896
|
Added Gen9 item data and fixed Punching Glove's effect
|
2023-01-24 16:47:54 -03:00 |
|
GriffinR
|
10230799d3
|
Simplify some max value macros
|
2023-01-23 16:01:46 -05:00 |
|
Eduardo Quezada D'Ottone
|
1202f0366c
|
Merge pull request #2586 from Jaizu/ability_popup_fixes
Ability popup updates
|
2023-01-23 17:34:18 -03:00 |
|
GriffinR
|
7681340966
|
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade
|
2023-01-23 14:45:51 -05:00 |
|
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 |
|
Eduardo Quezada D'Ottone
|
27fa8167c6
|
Merge pull request #2588 from TeamAquasHideout/upcoming
Fix Psycho Shift not buffering the string index for its printfromtable call
|
2023-01-23 10:35:09 -03:00 |
|
TeamAquasHideout
|
af07c451d0
|
Fix Psycho Shift printfromtable Error
|
2023-01-23 05:01:55 -05:00 |
|
GriffinR
|
f40fad528d
|
Merge pull request #1847 from GriffinRichards/mapjson-err
Better type conversions and errors for mapjson
|
2023-01-22 18:38:06 -05:00 |
|
Eduardo Quezada D'Ottone
|
1c7757032b
|
Merge pull request #2585 from ghoulslash/be/endturn_fix
add hp check to ITEMEFFECT_ORBS
|
2023-01-21 19:06:22 -03: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 D'Ottone
|
4855b370a9
|
Merge pull request #2583 from AsparagusEduardo/RHH/pr/sync/pret_20230120
| || || |_ (pret merge 2023/01/20)
|
2023-01-20 13:18:14 -03: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 |
|
GriffinR
|
0851e55ccb
|
Merge pull request #1657 from PikalaxALT/sync_battle_anim_args
Sync battle anim args
|
2023-01-18 12:16:49 -05:00 |
|
GriffinR
|
b7d92e8537
|
Revert incorrect constant usage, add new correct ones
|
2023-01-18 12:11:09 -05:00 |
|
GriffinR
|
d1e4bd44ce
|
Correct comment in maps.h
|
2023-01-18 11:54:06 -05:00 |
|
GriffinR
|
5a906c33ac
|
Merge branch 'master' into sync_battle_anim_args
|
2023-01-18 11:47:33 -05:00 |
|
GriffinR
|
ff3168f6cc
|
Merge pull request #1746 from mrgriffin/ui-standardize
Standardize the UI code
|
2023-01-18 11:15:52 -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 |
|
GriffinR
|
713e1825bd
|
Report JSON field names in errors
|
2023-01-17 16:25:33 -05:00 |
|
GriffinR
|
1e3b0e8d76
|
Treat all mapjson fields as strings
|
2023-01-17 16:00:09 -05:00 |
|
GriffinR
|
b836d9ebfb
|
Stop some redundant JSON reads
|
2023-01-17 15:40:39 -05:00 |
|
GriffinR
|
15431bd397
|
Add initial mapsjon type conversions
|
2023-01-17 15:25:39 -05:00 |
|
GriffinR
|
d5a4bfcd6f
|
Merge pull request #1843 from GriffinRichards/colorize
Colorize more grayscaled/incorrectly colored pngs
|
2023-01-15 12:48:42 -05:00 |
|
GriffinR
|
e839c8ebe5
|
Colorize tourney_info_card.png
|
2023-01-15 12:42:47 -05:00 |
|
GriffinR
|
0415cf73df
|
Fix results_screen/tiles.png colors
|
2023-01-15 12:04:29 -05:00 |
|
GriffinR
|
ba8bed4da3
|
Merge pull request #1846 from Jaizu/patch-31
Add constants when using GetMonsStateToDoubles_2
|
2023-01-15 08:46:11 -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
|
c663154760
|
Merge pull request #1836 from GriffinRichards/fix-clone
Add fix for Battle Tower cloning bug
|
2023-01-15 00:32:24 -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 |
|
GriffinR
|
14e8526a55
|
Merge pull request #1845 from AsparagusEduardo/pret/pr2/EasyChat
Improve Easy Chat documentation
|
2023-01-15 00:22:57 -05:00 |
|
Eduardo Quezada
|
70d59d6aa9
|
Improve Easy Chat documentation
|
2023-01-15 02:15:11 -03:00 |
|
GriffinR
|
aeec8d65ee
|
Merge pull request #1844 from Kurausukun/patch-2
Update INSTALL.md
|
2023-01-14 21:10:43 -05:00 |
|