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

116 Commits

Author SHA1 Message Date
RoamerX
af2b69f7e5 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2026-02-07 22:07:24 +08:00
FosterProgramming
edaa838a20
Fix berry tree spawning with max yield when OW_BERRY_ALWAYS_WATERABLE is active (#8976) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2026-01-28 15:50:06 +01:00
RoamerX
c20c5d851b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-06-23 20:29:34 +08:00
Bassoonian
24fdac662e Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196 2025-06-19 14:32:23 +02:00
Abaresk
bef343cefa Remove berry yield bug fix 2025-05-21 16:11:18 -04:00
RoamerX
254a7d541e Update berry.c 
树果文本检查及微调
 2025-04-22 12:34:41 +08:00
sayseong
3dac2efdcc 汉化树果 2025-04-22 00:01:26 +08:00
ExMingYan
078c99fea3 树果名、训练师类型、部分对战文本汉化 2025-04-09 02:00:00 +08:00
surskitty
5bd50e1e71
Fixing grammar of Berry Tree strings (#6355) 2025-02-27 18:21:09 +01:00
LOuroboros
adb4a1ff48
Added the Gen. 4+ berries to gBerryCrush_BerryData (#5937) 2025-01-06 08:03:44 -03:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Eduardo Quezada
5483e05db6 Fixed brace style inconsistencies 2024-12-05 12:46:50 -03:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
Bassoonian
b5c884504c
Fix negative mutation value (#5504) 2024-10-11 19:49:24 +02:00
psf
2597d8a35a
Updated species defines (#5075) 
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
 2024-10-02 18:24:57 -03:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456) 2024-10-02 21:20:23 +02:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers (#4767) 
* add item descption headers and (default-off) config

* revert test script

* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling

* add ow item header config value labels

* Update include/config/overworld.h

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-03 20:22:01 +02:00
psf
af12697845
Adds OW_BERRY_IMMORTAL (#5187) 
* Added OW_BERRY_IMMORTAL
Added cases for OW_BERRY_IMMORTAL

* removed one preproc

* removed other preproc

* Fixed identation

* Set config to FALSE

* Update include/config/overworld.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187#discussion_r1720747388

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652

* Update include/config/overworld.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-08-20 07:23:33 -04:00
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