ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-28 22:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,176 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

8642 Commits

Author SHA1 Message Date
Martin Griffin
cba4b78df6 Move-based mega evolution message for NPCs/recorded battles 2023-01-28 00:16:24 +00:00
Eduardo Quezada D'Ottone
f1d97bfad7
Merge pull request #2607 from mrgriffin/rhh-battlescript-fixes 
Fix uses of gBattlescriptCurrInstr
 2023-01-27 19:25:06 -03:00
Eduardo Quezada D'Ottone
53e41a2b3d
Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes 
Rhh battle tests fixes
 2023-01-27 19:24:13 -03:00
Martin Griffin
4e19d1aaec Fix uses of gBattlescriptCurrInstr 
- VARIOUS_SWAP_STATS and moveend could branch inside their own arguments.
- VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY was implemented in reverse.
 2023-01-27 21:27:57 +00:00
ghoulslash
2b58593e33
Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items 
Added some Gen9 item data and fixed Punching Glove's effect
 2023-01-27 16:13:50 -05:00
Martin Griffin
4ad4d8e25c Encore fails if target has not moved 2023-01-27 18:55:50 +00:00
Eduardo Quezada D'Ottone
4c4fa6a2b6
Merge pull request #2603 from TeamAquasHideout/upcoming 
Fix Wood Hammer To Have 1/3rd Recoil
 2023-01-27 10:47:32 -03:00
Team Aqua's Hideout
e87e8d0898
Fix Wood Hammer To Have 1/3rd Recoil 
Wood Hammer was set to 1/4th recoil before
 2023-01-27 08:16:37 -05:00
Martin Griffin
6a403ab45c Pastel Veil grants immunity to poison 2023-01-27 00:57:24 +00:00
Martin Griffin
3647825a30 Fix Poison Point 
It incorrectly activated only if the Pokémon with Poison Point could be
poisoned by the attacker.
 2023-01-27 00:57:24 +00:00
Martin Griffin
a13ffdbfba U-turn does not switch the user out if Emergency Exit activates 2023-01-27 00:57:22 +00:00
ghoulslash
92341e6d6a fix flame burst hitting semi-invulnerable partner 2023-01-26 13:04:01 -05:00
Jaizu
d074daedbe
Allow exiting the Battle Debug menu pressing B 2023-01-26 16:36:33 +01:00
Eduardo Quezada
7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 
# Conflicts:
#	tools/mapjson/mapjson.cpp
 2023-01-25 20:28:55 -03:00
walkingeyerobot
f9bb0bfb29
better handle throwing balls in a double wild battle (#2587) 
* Handle throwing balls in a double wild battle where the player has only a single Pokémon.
 2023-01-25 20:15:58 +00:00
GriffinR
f4cb6d229f Add some missing sizeof usage for SpriteSheets 2023-01-24 17:04:48 -05:00
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
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
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
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