Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,030 Commits 1 Branch 0 Tags
Commit Graph

98 Commits

Author SHA1 Message Date
Bassoonian
f12773dbb8
Fix possible agbcc corruption for tree mutations (#4535) 2024-05-09 16:22:17 +02:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275) 
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE

* Move level_caps.h to config folder

* Multiple EV/IV refered as EVs/IVs

* Disabled decap by default

* Level up learnsetst comments
 2024-03-12 12:21:03 +01:00
Bassoonian
a1c17a1de7 Fix FREE_ENIGMA_BERRY 2024-02-02 15:01:50 +01:00
Bassoonian
acf5d8133a Convert ifndef configs to standard configs 2024-02-02 12:43:31 +01:00
Bassoonian
d1bb078919 Merge branch 'saveblock' of https://github.com/ghoulslash/pokeemerald into ghoulsaveblock 2024-02-02 11:27:48 +01:00
Bassoonian
b9a02b205d
Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) 
* Rename gItems to gItemsInfo

* Rename gAbilities to gAbilitiesInfo

* Just fixing up my bad merge

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-26 15:25:52 -03:00
Zimmermann Gyula
58102e6fe8
Fix a typo in the Berry Exp. config setup. (#4028) 2024-01-19 23:58:58 +01:00
Bassoonian
1aff65029f
Deprecate GetBerryCountString (#4012) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-18 18:59:42 +01:00
Bassoonian
34ceb930cc
Fix YIELD_RATE (#3931) 2024-01-05 20:07:51 +01:00
Bassoonian
b56a9e6286 Remove unused function 2024-01-04 16:04:00 +00:00
Bassoonian
52eeca6e4e Replace berry descriptions with compound strings 2024-01-04 16:02:21 +00:00
Bassoonian
c115649349 Fix 6 stage Berry trees not growing properly 2023-12-24 23:08:15 +01:00
Bassoonian
662939d5f9 Add family defines 2023-12-23 00:41:47 +01:00
Bassoonian
ffb16c0dd5 ORAS drain rate 2023-12-08 12:03:16 +01:00
Bassoonian
1e0b895ecb Add missing check to prevents water grinding 2023-12-08 01:05:54 +01:00
Bassoonian
6173f9b81d Add soil moisturing config 2023-12-08 01:01:01 +01:00
Bassoonian
061e56a564 Make weeds and pests affect yield 2023-12-08 00:22:12 +01:00
Bassoonian
2b71187000 Add caretaking bonuses to berry data 2023-12-07 23:50:08 +01:00
Bassoonian
d7959879f1 Preset yield config 2023-12-07 18:06:20 +01:00
Bassoonian
ccb0e11235 Add generation-based growth rate config 2023-12-07 14:18:54 +01:00
Bassoonian
9d09b367a0 Refactor growth time and add six stage toggle 2023-12-07 13:22:01 +01:00
Bassoonian
9fa811dd71 Mulches affect gradient watering 2023-12-07 11:54:07 +01:00
Bassoonian
8e43b7d696 Debug Berry functions 2023-12-06 21:08:09 +01:00
Bassoonian
3e1c04cc26 Allow pests and weeds interaction 2023-12-05 22:13:21 +01:00
Bassoonian
36befdcdf8 Add moisture clock, weeds and pest generation 2023-12-05 21:54:17 +01:00
Bassoonian
5f2c8dfb0b Replace watered bits with a single equivalent field 2023-12-05 20:24:03 +01:00
Bassoonian
e4fd7845ee Store mutation as mutation id instead of berry id 2023-12-05 20:07:00 +01:00
Bassoonian
6da03e6cf0 Add Berry color and drain rate 2023-12-05 02:16:22 +01:00
Bassoonian
0d70d9951d Put Mulch behind config 2023-12-04 00:33:25 +01:00
Bassoonian
bd354f28e3 Allow for storing bonus Berries in Berry Yield 2023-12-04 00:17:41 +01:00
Bassoonian
b02b3d074f Add Mulch effects 2023-12-03 13:17:34 +01:00
Bassoonian
4628af3d55 Non-watering mulch effects 2023-11-30 13:34:33 +01:00
Bassoonian
a517e14c06 Berry Mutations 2023-11-29 13:26:43 +01:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
ghoulslash
ee0652416d merge w pret 2023-05-11 10:27:41 -04:00
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
SubzeroEclipse
58c4829a3c Missed a few ones 2022-02-18 22:25:35 +01:00
SubzeroEclipse
c9004c6cc4 Decapped Gen 3 Berries (names and descriptions) 2022-02-14 14:49:13 +01:00
SubzeroEclipse
888ab0b96e Decapped berries' names 2022-02-03 13:56:19 +01:00
ultima-soul
356cf96654 Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries. 2021-12-15 19:33:35 -08:00
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" 
This reverts commit ac2bcece75fa3bf5bc4018ce659e51a635d46b97, reversing
changes made to 349262ebc35abb090e51c689c74ee839713c83c6.
 2021-12-10 09:41:54 -08:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
ultima-soul
c74e19c062 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-11-09 20:58:19 -08:00
BuffelSaft
1429170d16 Fix long descriptions 
Just noticed some of these didn't fit in the box.
 2021-10-26 16:45:49 +13:00
BuffelSaft
adcf563ba1 Add missing berry data 
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
 2021-10-26 14:42:06 +13:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00