Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,699 Commits 1 Branch 0 Tags
5bcb6b8afda3f57c5489a7dfd64b3dc9289002bc
Commit Graph
11699 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bassoonian 5bcb6b8afd Update B_METRONOME_MOVES 2022-12-04 18:16:15 +01:00
Bassoonian dc97a31c31 Change battle_debug.c to MOVES_COUNT 2022-12-04 18:15:35 +01:00
Bassoonian c14fa82f43 Fix Headlong Rush description 2022-12-04 18:14:27 +01:00
BassoonianandEduardo Quezada D'Ottone 051ad7bf69 Update src/data/text/move_descriptions.h 
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-04 00:26:05 +01:00
Bassoonian 4ac1e4fc61 Power Shift is now a clone of Power Trick 2022-11-19 13:41:56 +01:00
Bassoonian 4da9ecbcea Prepare FLAG_SLICING_MOVE for merger with abilities branch 2022-11-18 22:37:31 +01:00
Bassoonian 4034f18c0e Update PLA descriptions 2022-11-18 22:30:40 +01:00
Bassoonian 739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00
Bassoonian 29ae22183b Mystical Power effect 2022-11-18 22:17:08 +01:00
Bassoonian 9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Bassoonian a250341e6c Forgot to reset Wicked Torque effect rate 2022-11-18 22:00:46 +01:00
Bassoonian 3ac3cb249e Wicked Torque effect 2022-11-18 22:00:21 +01:00
Bassoonian d4c92a0a19 Fix Bitter Malice's effect 2022-11-18 21:54:46 +01:00
Bassoonian ed33f2b9ce Change PLA moves to SV effects 2022-11-18 20:56:25 +01:00
Bassoonian e279185152 Update move data to GEN9 (with config) 2022-11-18 12:22:15 +01:00
Bassoonian f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
Eduardo Quezada D'Ottone 49b7328d32 Merge pull request #2451 from eatthepear/patch-1 
Fix Berries that were broken after Bug Bite fix
 2022-11-12 17:26:29 -03:00
eatthepear bd4b660983 Fix Berries that were broken after Bug Bite fix 
Issue #2448 
Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works.
I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).
 2022-11-11 21:28:44 -05:00
Eduardo Quezada D'Ottone 6197e76875 Merge pull request #2449 from LOuroboros/patch-1 
Uncommented level up moves
 2022-11-11 01:46:42 -03:00
LOuroboros 7260478c54 Uncommented level up moves 2022-11-11 01:31:22 -03:00
Eduardo Quezada D'Ottone a2b355f2a4 Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221030 
Support for Porymap 5.0.0 (pret merge 2022-10-30)
 2022-11-09 20:15:15 -03:00
Eduardo Quezada f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/rom_header_gf.c
 2022-11-09 19:54:44 -03:00
Eduardo Quezada bd63ef18af Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/pokemon_storage_system.c
 2022-11-09 19:33:26 -03:00
GriffinR 9e24fe6ec8 Merge pull request #1816 from LOuroboros/patch-1 
Fixed indentation in ScrCmd_faceplayer
 2022-11-08 19:07:34 -05:00
LOuroboros a35986fd9c Fixed indentation in ScrCmd_faceplayer 2022-11-08 21:01:50 -03:00
Eduardo Quezada D'Ottone e6ae0bd01e Merge pull request #2434 from LOuroboros/badDreams 
Optimized Bad Dreams' code
 2022-11-08 08:16:07 -03:00
GriffinR 0a6de12b5e Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc 
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
 2022-11-06 23:35:53 -05:00
Eduardo Quezada 237877e21b Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System 2022-11-07 00:00:23 -03:00
BuffelSaft 1da4eb3b14 Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid 
Config for Dark Void being only usable by Darkrai
 2022-11-05 22:42:51 +13:00
BuffelSaft bbd7b205fd Merge pull request #2433 from ghoulslash/be/bug_bite 
Redo Bug Bite
 2022-11-05 22:08:47 +13:00
LOuroboros f56df74576 Optimized Bad Dreams' code 
Misc:
-Made the ability pop up stick around until the ability's effect ends just like in ORAS.
-Updated sText_BadDreamsDmg accordingly while I was at it.
 2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone fa8bf80905 Merge pull request #2420 from LOuroboros/teleport 
Updated CanTeleport
 2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone 2b5aff2764 Merge pull request #2426 from tustin2121-2/patch-linker 
GF Header and Modern Builds
 2022-11-04 12:27:13 -03:00
BuffelSaft d05c74b9e9 Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams 
Fixed Bad Dream's ability popup message
 2022-11-05 03:42:44 +13:00
ghoulslash 7a0e541413 workaround for GetBattlerHoldEffectParam to handle bug bite different battler id 2022-11-04 10:29:05 -04:00
Eduardo Quezada 5b1552514e Review changes 2022-11-04 11:10:06 -03:00
GriffinR b1af66ebe5 Merge pull request #1812 from tustin2121/patch-linker 
GF Header and Modern Builds
 2022-11-04 09:31:31 -04:00
ghoulslash 1e6903840a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite 2022-11-04 09:29:45 -04:00
ghoulslash d13431b4ab merge w rhh master 2022-11-04 09:29:39 -04:00
ghoulslash f3d44f04f0 Merge pull request #1927 from AsparagusEduardo/PE_monAnimations 
Ported Gen 5 & 6 mon animations from Inclement Emerald + added most missing Gen 7 form animations
 2022-11-04 09:17:31 -04:00
Eduardo Quezada 8c66b318eb Fixed Bad Dream's ability popup message 2022-11-04 00:46:07 -03:00
Eduardo Quezada d23b5c95c9 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations 
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
 2022-11-03 23:31:20 -03:00
Eduardo Quezada fbc71b3686 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-11-03 21:46:37 -03:00
Eduardo Quezada edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone 9ea3ad8938 Merge pull request #2427 from BuffelSaft/fix-stat-boost-on-hit 
Fix abilities that raise target's stat after hit
 2022-11-03 08:50:18 -03:00
BuffelSaft c169a9523e Merge branch 'upcoming' into fix-stat-boost-on-hit 2022-11-03 22:01:30 +13:00
BuffelSaft 736ca893b6 Fix abilities that raise target's stat after hit 
Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.
 2022-11-03 21:54:56 +13:00
tustin2121 116364334d Fix build of jsonproc 
- Changing uint to unsigned int, as uint is not standard.
 2022-11-02 19:51:43 -05:00
tustin2121 b32413d11e Restoring the GFHeader 
- Also adding comment about what the header does and how to maintain it.
 2022-11-02 12:45:36 -04:00
tustin2121 e698a6506f Pinning GFHeader to front of modern 
- Pinning the GF Header, crt0, and main to the front of the ROM when building modern.
- Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).
 2022-11-02 12:44:32 -04:00