ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,699 Commits 1 Branch 0 Tags 235 MiB
a877266400
Commit Graph

58 Commits

Author SHA1 Message Date
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-02 21:19:01 +02:00
Shae
ae2d5f7d1e
Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957) 2023-05-02 14:08:05 -04:00
CallmeEchoo
6758f6ebe7 add some snow related tests 2023-05-02 16:25:26 +02:00
CallmeEchoo
0bf92943d4 spelling 2023-05-02 16:25:26 +02:00
CallmeEchoo
76721b16f8 add snow weather 2023-05-02 16:25:26 +02:00
ghoulslash
8cce130643
Add Frostbite status (#2942) 2023-05-01 09:45:47 -04:00
Ultimate_Bob
32e63d8cc7
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-30 21:15:03 -04:00
Alex
176c6750aa
Set new animations as default (#2964) 2023-04-30 10:02:18 -04:00
Bassoonian
c279830892 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution 2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix 2023-04-26 14:25:36 -04:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev 2023-04-25 19:50:26 +02:00
ghoulslash
909a20c27a
Reset battle vars and flags after player whites out (#2875) 2023-04-23 08:42:52 -04:00
ghoulslash
594bc831d6
Adds define B_RESTORE_HELD_BATTLE_ITEMS following Gen9 (#2932) 2023-04-23 08:26:51 -04:00
Bassoonian
a561c6da6a Add config to Frostbite & allow it to be inflicted 2023-04-22 23:14:49 +02:00
citrusbolt
6c7f5881e4
Add two EV-related configs (#2825) 2023-04-20 10:05:32 -04:00
Alex
3aec63b8cf new define to restore items after battle 2023-04-20 15:08:42 +02:00
psf
d3fed5639b
Added config to enable NEW_ROCKS_PARTICLE (#2929) 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-04-19 18:54:57 -04:00
Bassoonian
d5b36c7c60
Reusable TMs (#2903) 
* Reusable TMs
* Forgot about Gen9 making TMs expendable again
* Change importance check based on Alex's suggestion
* Prevent items with importance from being bought more than once
* Change importance check to ghoul's suggestion
* Update include/config/item.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-18 19:52:20 -04:00
Alex
76d0d8a94e
Fix battle message strings for stats (#2927) 
* Fix battle message strings for stats
 2023-04-18 22:02:51 +01:00
Eduardo Quezada
11beec62ee Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/data/pokemon/evolution.h
#	src/field_poison.c
 2023-04-14 11:31:02 -04:00
ghoulslash
c3e9f4b571
Added B_DOUBLE_WILD_REQUIRE_2_MONS to use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party (#2878) 2023-04-07 09:26:22 -04:00
psf
59dfc7c3ad
Update include/config/battle.h 
Took suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/2875#discussion_r1160574308

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-04-07 06:07:12 -07:00
Bassoonian
dfee8a4759 OW Poison configs 2023-04-06 00:26:52 +02:00
psf
48f90a7155
Update explanation in include/config/battle.h 
Changed the comment in include/config/battle.h per PR comment: https://github.com/rh-hideout/pokeemerald-expansion/pull/2878#discussion_r1154322931

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-01 14:12:50 -07:00
PSF
24df9823e8 In response to PR discussion, added new preproc config for developers to toggle Overworld_ResetBattleFlagsAndVars 2023-03-30 06:35:38 -07:00
pkmnsnfrn
6a7466c929 Added B_DOUBLE_WILD_REQUIRE_2_MONS to allow use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party 2023-03-29 11:11:07 -07:00
PSF
686d42709a Added documentation on resetting battle flags and vars 
Added Overworld_ResetBattleFlagsAndVars to Overworld_ResetStateAfterWhiteOut
 2023-03-28 15:50:58 -07:00
AgustinGDLV
2017bee3f8 fixed Castform + Cherrim 2023-03-27 11:35:23 -07:00
Eduardo Quezada
3888b10769 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
 2023-03-27 10:55:38 -03:00
LOuroboros
f06c040bca Updated the debug menu 
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
 -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
 2023-03-08 15:27:22 -03:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings (#2737) 
* start working on defog tests

* defog tests + improve terrain end battlescripts

* newline
 2023-03-06 20:35:08 +01:00
DizzyEggg
c92a65dc40 Add config for stockpile raising def stats 2023-02-27 21:09:02 +01:00
DizzyEggg
53180ebf87
Update Healing wish to gen5 / gen8 mechanics (#2708) 
* Updated Healing Wish and added config
* Fixed Lunar Dance message

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-02-20 11:25:43 +00:00
Eduardo Quezada D'Ottone
ec343cef02
Config to have Shuckle make Berry Juice from Oran Berries (#2331) 
* Removed unused ifdefs and made actually check for Z Power Ring

* Config to have Shuckle make Berry Juice from Oran Berries

* Ordered species-specific configs
 2023-02-19 10:45:59 +01: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
Bassoonian
333917941b Add PLA+ obedience mechanics (with config) 2023-01-11 08:15:57 +01:00
Eduardo Quezada
f8c9e7af40 Fixed config comment 2023-01-09 11:06:27 -03:00
Eduardo Quezada
1b0ce96e12 Config for ball inheritence when breeding 2023-01-09 02:16:29 -03:00
Eduardo Quezada
911541ba4f Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby 
# Conflicts:
#	include/config/pokemon.h
 2023-01-08 18:48:01 -03:00
Eduardo Quezada
d72a3731d4 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_move_effects.h
 2023-01-06 15:25:49 -03:00
Eduardo Quezada
55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2023-01-04 16:19:57 -03:00
ghoulslash
1d2cb49bc6
Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg 
Config to restore Gen 3's damage reduction to multi target moves
 2023-01-04 09:18:39 -05:00
ghoulslash
2944ebfe7b
Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances 
Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+
 2023-01-02 13:55:36 -05:00
LOuroboros
cdfec0fc05
Updated B_DOUBLE_WILD_CHANCE 2023-01-02 15:42:30 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
Eduardo Quezada
1fc86e52b5 Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+ 2022-12-27 21:18:20 -03:00
Eduardo Quezada
95f39c8c81 Config to restore Gen 3's damage reduction to multi target moves 2022-12-27 15:24:43 -03:00
Eduardo Quezada
28cffda9d4 Hatch level config 2022-12-22 10:38:54 -03:00
Eduardo Quezada
d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2022-12-22 10:30:01 -03:00
Eduardo Quezada
4ed20dca8c Forgot to restore config to GEN_LATEST 2022-12-21 17:28:24 -03:00