atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14501 commits 2 branches 40 tags 617 MiB
Commit graph

14501 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Griffin
97cb4cdb24
Fix static variable names (#3637) 2023-12-08 12:57:13 +00:00
Bassoonian
3b337672e9 Fix static variable names 2023-12-08 12:46:52 +00:00
Bassoonian
4f66ac4cfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2023-12-08 12:03:44 +01:00
Bassoonian
ffb16c0dd5 ORAS drain rate 2023-12-08 12:03:16 +01:00
Eduardo Quezada D'Ottone
7016f25329
Fixed Fusion memory leak (#3644) 
* Fixed Fusion memory leak

* using u32

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-08 11:37:47 +01:00
Alex
f6bd9663ad
Forgot to do coordinates for new sprites (#3646) 2023-12-08 11:13:14 +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
Alex
1b701d9dda
New pokemoncommunity sprites (#3643) 2023-12-07 23:50:51 +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
c8d356a3f1 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2023-12-07 12:18:50 +01:00
Bassoonian
9be5d4fba1 Add single stage growth to debug menu 2023-12-07 12:05:12 +01:00
Bassoonian
9fa811dd71 Mulches affect gradient watering 2023-12-07 11:54:07 +01:00
Bassoonian
6ba4ec744b Small change to debug script for clarity 2023-12-07 11:46:44 +01:00
Bassoonian
8e43b7d696 Debug Berry functions 2023-12-06 21:08:09 +01:00
CyanSMP64
8ac66cdc76
Pokemon sprite review part 2 (#3612) 
* sprite review part 2

* fix hisuian sliggoo back coordinate

* fix muk anim

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-06 18:18:04 +01:00
Zimmermann Gyula
7f0b1da561
Fix HGSS Pokédex teachable moves list. (#3624) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-06 18:05:04 +01:00
Patrick Curran
f7ca839f23
EFFECT_CHILLY_RECEPTION (#3379) 
* Chilly Reception Effect

* Wrap Chilling Reception Message Better

* Animation & Some Testing

* Remove Wimp Out cases from Chilly Reception tests

* Animation tweaks

* Battle Script Updates
* Created CheckPrimalWeather macro for Weather Effects
* Updated Chilly Reception logic to switch even if weather doesn't change

Testing Updates

* Fixed test: Move does not animate if weather fails to change

* Remove snow animation check during failure path test

* * Fix indentation
* Move Chilly Reception animation to always play (even when weather change fails)

* Updates to MoveSwitch and PartingShot to get closer to original logic

* Update BattleScript_EffectChillyReception logic

* * Move CHILLY_RECEPTION animation
* Test updates

* Fix Chilly Reception MESSAGE  checks

---------

Co-authored-by: Patrick Curran <rapidnutcracker@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-06 17:11:13 +01:00
Bassoonian
e6a6ea4977
Start gen defines at Gen I (#3628) 
* Start gen defines at Gen I

* Refactor Shuckle config

* Oops

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-06 16:52:01 +01:00
Bassoonian
748259284d
Update PR template (#3639) 2023-12-06 10:42:34 -03: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
ddcd0dbb78 Weeds and Pests strings 2023-12-05 20:02:11 +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
Eduardo Quezada
d076193b9f Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle.h
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
 2023-12-03 16:39:32 -03:00
Bassoonian
45e19d22fa Remove lost comment 2023-12-03 13:22:58 +01:00
Bassoonian
b02b3d074f Add Mulch effects 2023-12-03 13:17:34 +01:00
LOuroboros
6b1ea33be8
Fixed Trace (#3623) 
* Applied Alex's fix for ABILITYEFFECT_TRACE

* Added Trace tests written by Alex/Rainonline

* Updated Trace's target-choosing capabilities and added a double battle test for it
Credits to Alex/Rainonline.

* Removed 2 of the 3 'Trace on opponent's switch-in' tests

* Added another Trace test
 2023-12-02 23:09:09 +01:00
GriffinR
e4149e83f8
Merge pull request #1962 from LOuroboros/patch-1 
Updated the size of the struct InGameTrade's otName variable
 2023-12-02 10:44:31 -05:00
LOuroboros
05708ace88
Updated the size of the struct InGameTrade's otName variable 2023-12-02 12:11:22 -03:00
Eduardo Quezada D'Ottone
ff0351ca70
Ask users for credits in README.md (#3619) 
* Ask users for credits in README.md

* Consistently refer to the repo as pokeemerald-expansion

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-01 16:41:33 +01:00
Alex
d1a69d7e04
fix new line (#3621) 2023-11-30 20:01:21 -03:00
Bassoonian
4628af3d55 Non-watering mulch effects 2023-11-30 13:34:33 +01:00
Pawkkie
131bb94d73
Extend AI_FLAG_SMART_SWITCHING for Encore / hazards / lowered attacking stats (#3557) 
* Consider Encore / lowered stats / hazards

* Fix poorly thought out Return FALSE

* Incorporate Egg's feedback

* Tests for hazards and stats, and some fixes

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-30 12:37:19 +01:00
psf
2b1d36db46
Fix issue where Sky Battles cause upcoming not to compile when debug menu is turned off (#3617) 
* Moved Sky Battle error message outside of debug.inc
https://github.com/rh-hideout/pokeemerald-expansion/issues/3615\#issue-2015546179

* Update data/scripts/debug.inc

Made changes from Jasper's review

625f007741

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

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-29 23:08:36 +01:00
Alex
4bde378c0d
Fixes Floral Healing + Tests (#3604) 2023-11-29 13:57:29 +01:00
Bassoonian
a517e14c06 Berry Mutations 2023-11-29 13:26:43 +01:00
sbird
acab86d098 Merge branch 'feature/dynmulti' of github.com:SBird1337/pokeemerald into feature/dynmulti 2023-11-29 13:20:03 +01:00
sbird
cefb05bdec [dynmulti] left/top read from variables 2023-11-29 13:19:37 +01:00
sbird
ecab5cc106 Merge remote-tracking branch 'pret/master' into feature/dynmulti 2023-11-29 13:06:18 +01:00
Alex
913bc6c9d0
Adds White Herb tests (#3611) 2023-11-29 11:05:06 +01:00
ghoulslash
8c4058c7a8
add HITMARKER_DISABLE_ANIMATION for bug bite consumeberry (#3607) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-28 18:57:11 +01:00