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 |
|
Kurausukun
|
c28d8056c3
|
Update INSTALL.md
Clarify that WSL is also available on Windows 11
|
2023-01-14 21:05:10 -05:00 |
|
GriffinR
|
41c85b4af6
|
Fix slot_machine/menu colors
|
2023-01-14 16:34:14 -05:00 |
|
GriffinR
|
71d4b1687a
|
Fix party_menu/bg colors
|
2023-01-14 12:32:54 -05:00 |
|
GriffinR
|
9be0818b78
|
Fix intro/scene_1 tiles
|
2023-01-14 00:48:58 -05:00 |
|
GriffinR
|
9c34bc2385
|
Colorize picture_frame tiles
|
2023-01-13 15:30:57 -05: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 |
|
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
|
0064db7a6d
|
Correct colors for frontier_pass
|
2023-01-13 02:25:23 -05:00 |
|
GriffinR
|
ee3f5033b3
|
Colorize contest/interface.png
|
2023-01-13 00:26:40 -05:00 |
|
Eduardo Quezada
|
77cc407386
|
Review change
|
2023-01-12 23:44:34 -03:00 |
|
GriffinR
|
52e00ac603
|
Correct colors in summary_screen/tiles.png
|
2023-01-12 21:41:06 -05:00 |
|
GriffinR
|
3a253ece0f
|
Fix some colors in crusher.png
|
2023-01-12 19:04:49 -05:00 |
|
GriffinR
|
89286c91e3
|
Merge pull request #1842 from GriffinRichards/gbagfx-pals
Automatically constrain png pixels to bit depth
|
2023-01-12 16:36:05 -05:00 |
|
GriffinR
|
a12432a0f3
|
Colorize crusher.png
|
2023-01-12 16:34:36 -05:00 |
|
GriffinR
|
12cbb0b30f
|
Colorize and combine birch_bag/birch_grass
|
2023-01-12 15:22:23 -05:00 |
|
GriffinR
|
863779afbb
|
Colorize rayquaza_scene/scene_1/clouds.png
|
2023-01-12 14:56:44 -05:00 |
|
GriffinR
|
0fd0eb7163
|
Colorize cable_car/bg.png
|
2023-01-12 14:47:04 -05:00 |
|