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
11,266 Commits 1 Branch 0 Tags 235 MiB
2d78ac0192
Commit Graph

11266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada
2d78ac0192 Implemented Lures using the same vars as repels 2022-09-12 10:21:49 -03:00
Deokishisu
e3c19f5df5 Implement B2W2 Repel System 
The game now asks if the player would like to use another Repel when the one they used runs out.

# Conflicts:
#	include/constants/vars.h
 2022-09-12 10:21:38 -03:00
Eduardo Quezada
66177e7958 Reworked shiny charm rerolls allow adding additional rerolls when necessary 2022-09-12 10:21:21 -03:00
Eduardo Quezada D'Ottone
17fecd5996
Merge pull request #2313 from LOuroboros/intrepidDoges 
Fixed the hero duo's abilities
 2022-09-11 21:45:18 -04:00
Eduardo Quezada D'Ottone
6cbcbf41da
Merge pull request #2314 from LOuroboros/abilityPopUps 
Fixed ability pop ups
 2022-09-11 21:41:51 -04:00
LOuroboros
fc65a483aa Fixed ability pop ups 2022-09-11 22:34:24 -03:00
LOuroboros
717d06bd17 Fixed the hero duo's abilities in doubles 2022-09-11 21:57:42 -03:00
LOuroboros
e624f205ba Added CompareStat checks for the hero duo's abilities 2022-09-11 21:46:40 -03:00
Eduardo Quezada D'Ottone
c340f8f051
Merge pull request #2309 from Jaizu/patch-28 
Fix Lure prices
 2022-09-11 12:13:26 -04:00
Jaizu
0daeee83f3
Fix Lure prices 
This change reflects the original prices used in Pokémon let's go pikachu/eevee
 2022-09-11 18:06:05 +02:00
Eduardo Quezada D'Ottone
6e7f139716
Merge pull request #2304 from LOuroboros/shashaForms 
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
 2022-09-09 15:35:09 -04:00
LOuroboros
ceb0c67bcf Modified check in case FORM_ITEM_USE of GetFormChangeTargetSpeciesBoxMon 2022-09-09 16:17:13 -03:00
LOuroboros
12fee71008 Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE 2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms 
Introduced FORM_BATTLE form changes
 2022-09-09 14:15:53 -04:00
LOuroboros
e8832a2655 Updated FORM_ITEM_HOLD check in GetFormChangeTargetSpeciesBoxMon 2022-09-09 14:56:12 -03:00
ghoulslash
61cde312cc
Merge pull request #2301 from Blackforest92/RHH-PR-Branch 
Tyding graphics - Acupressure
 2022-09-09 10:26:23 -04:00
Eduardo Quezada D'Ottone
54ad9ec1d3
Merge pull request #2302 from LOuroboros/patch-1 
Small syntax fix for CanLearnTeachableMove
 2022-09-08 17:01:15 -04:00
LOuroboros
db6d285f00
Small syntax fix for CanLearnTeachableMove 2022-09-08 17:53:15 -03:00
Blackforest92
caf323a653 Erase ghost data in include/constants/map_groups.h 2022-09-09 00:40:30 +07:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
4a6d3d1deb
Whitespace 2022-09-08 00:19:13 -04:00
Eduardo Quezada D'Ottone
0d4455f951
Merge pull request #2150 from Sneed69/weather_forms_fixes 
Weather forms fixes and config
 2022-09-07 23:15:48 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
a7a1ab9aeb Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 19:20:11 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
LOuroboros
f1c153e469 Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 18:37:16 -03:00
TheXaman
94995c54fb fix? 2022-09-06 23:35:05 +02:00
Eduardo Quezada D'Ottone
f79e9f02de
Merge pull request #2289 from Blackforest92/RHH-PR-Branch 
Tidying Graphics/Battle_Anims
 2022-09-06 17:02:25 -04:00
TheXaman
b249399a53 changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()' 2022-09-06 23:00:26 +02:00
Eduardo Quezada D'Ottone
3fe9ef26b5
Merge pull request #2299 from ghoulslash/readme_updates 
update readme with credits, wiki links
 2022-09-06 15:52:23 -04:00
ghoulslash
d33e4b0fe8
Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor 
Config refactor
 2022-09-06 15:32:37 -04:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
79bfbfb1b0
Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose 
Comatose prevents Battle Pike's status effects.
 2022-09-06 15:18:48 -04:00
ghoulslash
59de7e48e5
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix 
Fixed PokemonSubstruct3 alignment
 2022-09-06 15:14:45 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
ghoulslash
51a569b66b
Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix 
Fixed ball multiplier fallthroughs
 2022-09-06 15:10:28 -04:00
ghoulslash
9e4b18dfe2 update readme with credits, wiki links 2022-09-06 14:28:52 -04:00
Eduardo Quezada
7a0838a0f2 Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table 2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
Eduardo Quezada
cb97f93ef6 Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config 2022-09-05 14:49:40 -04:00
Eduardo Quezada
e253a87bc5 Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once. 2022-09-05 14:49:14 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
Eduardo Quezada D'Ottone
75c4e7dc13
Merge pull request #2295 from Yak-Attack-1012/water_sport_past_gens 
v -> STATUS4_WATER_SPORT (battle_script_commands.c)
 2022-09-05 13:37:04 -03:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
U-DESKTOP-K1J86FD\Owner
7dabd903ce v -> STATUS4_WATER_SPORT (applicable to Gens 3-5) 2022-09-05 12:07:38 -04:00
Eduardo Quezada D'Ottone
99a9b9f859
Merge pull request #2218 from LOuroboros/patch-1 
Updated Serene Grace checks in AI_CheckViability
 2022-09-05 10:30:18 -03:00
Eduardo Quezada D'Ottone
65a4d4ed44
Merge pull request #2294 from LOuroboros/patch-2 
Updated GetBattleMonMoveSlot
 2022-09-05 07:09:47 -03:00
TheXaman
f6d111d0c7
Update src/debug.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:17:21 +02:00