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

13536 Commits

Author SHA1 Message Date
Frank DeBlasio
1ba0875654
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166) 
* Removed FRONTIER_BRAIN_SPRITES

* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE

* Updated TRAINER_CLASS macro

* Removed FRONTIER_BRAIN_TEXTS

* Turned Frontier Brain text to COMPOUND_STRINGs

* Removed frontier_brain.inc from event_scripts.s

* Addressed front sprite comment

* Addressed backsprite comments
 2024-09-22 09:54:01 +02:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother (#4816) 
* Smoother primal/mega animation

* Just to make the CI run. It needs to run

* Update src/battle_anim_effects_3.c

---------

Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-21 23:47:19 +02:00
Bassoonian
832a7b286d
Update item_use.c (#5415) 2024-09-21 21:22:30 +02:00
Frank DeBlasio
d1bb7770d3
Converted berry and PokeBlock strings to COMPOUND_STRINGs (#5324) 
* Converted bag pocket names to COMPOUND_STRINGs

* Converted berry-related text to COMPOUND_STRINGs

* Converted PokeBlock-related text to COMPOUND_STRINGs

* Added indexes to BerryFirmnessStrings

* Updated call to sBerryFirmnessStrings

* Changed gText to sText
 2024-09-21 20:44:25 +02:00
Bassoonian
8ba96fdac4
Add OW_AUTO_SIGNPOST and associated metatile behaviors (#5044) 2024-09-21 20:39:07 +02:00
kittenchilly
39a8a77d3d
Play point animation when sending a follower into battle (#5406) 
* Add point animation when sending a follower into battle

* Update trainers.h
 2024-09-21 20:28:20 +02:00
kittenchilly
f7d2e62ccc
Fix Switcheroo giving score even if the opponent has no held item (#5412) 2024-09-21 18:51:08 +02:00
ghoulslash
4cd23a377d
anger shell use saveattacker (#5409) 
* anger shell use saveattacker

* tabs instead of spaces

* add BattleScript_RestoreAttackerButItFailed for anger shell failure

* Update data/battle_scripts_1.s

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

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-20 18:19:45 +02:00
GriffinR
a551efea43 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-09-19 12:33:34 -04:00
GriffinR
e4e90eacd6
Merge pull request #2023 from Bassoonian/updatemapmacros 
Fix defines in MAP_NUM and MAP_GROUP
 2024-09-19 12:17:16 -04:00
Rose Silicon
64d4d7e570
Simplify HP Logic (#5403) 2024-09-19 18:03:13 +02:00
pkmnsnfrn
f0bd3c57da Fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#pullrequestreview-2315029773 2024-09-19 05:45:11 -07:00
Alex
68c51f8412
Fixes Spiky Shield Counter interaction (#5402) 
* Fixes Spiky Shield Counter interaction

* Update test/battle/move_effect/protect.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-19 12:00:32 +02:00
Bassoonian
cafeb3fa92 Update wild encounters json template 2024-09-19 11:27:02 +02:00
Bassoonian
49735754c3 Remove accidental expansion leftovers 2024-09-19 11:23:33 +02:00
Alex
5cb1be7e5c
Minor Gem check optimazation (#5401) 
Since the variable is only used once I removed it and replaced it with a direct call. Also the if statement is short enough to fit into one line.

very ocd induced change but I couldn't look away.
 2024-09-19 10:58:56 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects (#5391) 
* Ogerpon masks were missing their hold effects

* fix wrong num

* test

* correct tests and additional fix

* added hold effect to battle debug
 2024-09-19 00:25:53 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests (#5400) 
* Fix Quash + After You and Quash configs

* Add tests
 2024-09-19 00:10:29 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change (#5398) 
* changes Growth's move description to account for Gen 5+ behavior

* completes B_DIVE_BALL_MODIFIER comment

* fixes typos and incongruent spacing in various files

* Update src/data/moves_info.h

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

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-18 23:03:36 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot (#5397) 2024-09-18 16:58:49 +02:00
RavePossum
27db57f854
fallback on default BW popup theme to reduce potential for error (#5392) 2024-09-18 16:57:13 +02:00
Kurausukun
52c2728ff6 remove gflib 2024-09-18 10:37:34 -04:00
Alex
95dac7c4ac
Remove potential uninitialized behavior (#5393) 
`MAX_BATTLERS_COUNT` makes more sense to use here because we iterate over max battlers in the first place.
 2024-09-17 20:58:43 +02:00
Eduardo Quezada
53414cb8bb Form changes and evolutions happen based on fake RTC 2024-09-16 16:15:30 -03:00
Bassoonian
0b429a8649
Merrp merge (September 9th) (#5359) 2024-09-15 13:21:39 +02:00
Alex
25e9ca2ac6
Cleaned up a bit of code with GetBattlerPartyData (#5378) 
* rename GetBattlerPartyData
 2024-09-15 08:24:26 +02:00
Sadfish the Sad
f6319d8446
new animations for many moves more details in description (#5367) 
New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark
Updated: Aura Sphere, Dark Void, Spirit Shackle
Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)
 2024-09-15 08:22:40 +02:00
Alex
0d7c193e4c
fixes Micle Berry not increasing accuracy on the next turn (#5358) 
* fixes Micle Berry not increasing accuracy on the next turn

* adds bitfield instead of using protect struct

* test from pawkkie

* ndebug

* renaming

* delete redundant comment

* typo

* micle berry more detailed descriptions
 2024-09-14 19:55:03 -04:00
Liamjd14
9d483cee5d
Enable asym for followers issue #5382 (#5385) 
* Applies asym code to followers
galarian slowbro
tinkaton line
scovillain
 2024-09-14 20:21:34 +02:00
pkmnsnfrn
60fb0b34fd Modified getobjectxy to allow for custom destinations 2024-09-14 07:48:24 -07:00
pkmnsnfrn
1665423e52 Renamed scripts to match vanilla 
Cleaned up descriptions
 2024-09-14 07:11:04 -07:00
pkmnsnfrn
a509f28038 Changed Scripot_GetObjectFacingDirection to callnative 2024-09-14 06:32:47 -07:00
Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup (#5383) 2024-09-14 10:45:26 +02:00
Alex
fbea1e7e7e
Fixes Defog used by the wrong side when there is a Substitue and Screen (#5381) 2024-09-14 08:16:20 +02:00
PhallenTree
c7e1e857f3
Fix After You/Shell Trap not updating battlers' actions correctly (#5384) 2024-09-13 18:17:59 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests (#5370) 
* Simplified fix from #4638

* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge

* Powder Tests

* Remove duplicate

* Assume Powder is a powder move

* Add config for Powder Rain interaction

* Only primal rain

* Z-Moves fix handled in Canceller_Z_Moves

* Fix BattleScript name

* Make sure Z-Move + Powder still damages user
 2024-09-13 18:08:23 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example (#5309) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-13 10:30:01 -03:00
Eduardo Quezada
8c0580828f
Apply suggestions from code review 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-13 09:27:16 -03:00
pkmnsnfrn
510af1bee6 Restored original functions and made script versions 2024-09-12 20:55:37 -07:00
pkmnsnfrn
ecd435cd84 Changed CheckChosenMOnMatchDesiredSpecies and CheckPartyHasSpecies to callnative 2024-09-12 20:45:14 -07:00
pkmnsnfrn
c2db77c4f6 Changed Script_GetSetPokedexFlag to callnative 2024-09-12 20:15:55 -07:00
pkmnsnfrn
be7938f322 Changed CheckObjectAtXY to callnative 2024-09-12 18:55:11 -07:00
pkmnsnfrn
10bb349b8c Changed GetObjectPosition to callnative 2024-09-12 18:41:42 -07:00
Alex
3d8b73300a
Fixes Multi Hit moves removing destiny bond flag in the middle of attack (#5377) 2024-09-12 17:46:59 -04:00
psf
1ba8e7d300
Merge branch 'upcoming' into signpost 2024-09-12 14:45:37 -07:00
psf
51a69b6a9d
Merge branch 'upcoming' into stairWarps 2024-09-12 14:43:46 -07:00
Pawkkie
9bdc9e5dab
Disguise KO prevention consideration (#5375) 2024-09-12 19:49:29 +02:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 (#5336) 2024-09-12 18:55:30 +02:00
Alex
c804e605d8
Adds CanEndureHit AI function (#5373) 
* Adds CanEndureHit AI function

* use ai data

* missed a function
 2024-09-12 11:40:17 -04:00
Eduardo Quezada
56859e35e0 Using TIME instead of TIME_OF_DAY 2024-09-12 10:26:58 -03:00