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

16489 commits

This branch
This branch
All branches
Author SHA1 Message Date
ghoulslash
b7246a018c merge w upcoming 2024-09-22 09:13:25 -04:00
ghoulslash
ed005fc345
Fix affection check for exp multiplier (#5421) 2024-09-22 08:47:37 -04:00
Bassoonian
d122c0a222 Fix affection check for exp multiplier 2024-09-22 14:14:15 +02:00
Bassoonian
60e2c0f859
Merge item description branch history (#5419) 
* Recreated ghoul's item_desc_header branch

Fixed tabs vs spaces

Fixing whitespace

* Fixed item in header not showing on maximum flash level

* Fixed item icon being affected by thunderstorms

* Shops now set the obtained item flag.

* Fixed build

* fix seashore house

* better soda pop fix, thx asparagus

* fix item icon showing in battle pyramid

* fix hiding item desc in battle pyramid

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-09-22 12:05:45 +02:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative (#5418) 
* settotemboost use callnative

* Update src/battle_main.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-22 11:25:42 +02:00
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
473e0623ba
Merge pull request #2031 from GriffinRichards/fix-toolchain 
Minor toolchain fixes
 2024-09-19 12:23:58 -04:00
GriffinR
8f41d9eb17
Merge branch 'master' into fix-toolchain 2024-09-19 12:20:51 -04:00
GriffinR
635325304b
Merge pull request #2033 from Kurausukun/goodbye_gflib 
Remove gflib
 2024-09-19 12:19:48 -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
psf
fee26e29f5
Add AUTO_SCROLL_TEXT and NUM_FRAMES_AUTO_SCROLL_DELAY (#5054) 
* Added AUTO_SCROLL_TEXT

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268265

* Apply suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268524

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

* Added ability to skip text with button press per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054\#issuecomment-2267100771

* Update gflib/text.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054#issuecomment-2274402891

* Update text.h

* Fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files\#r1711780606

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY

* Update gflib/text.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-19 12:01:12 +02: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
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
9cb353179b fix indentation 2024-09-18 10:42:28 -04: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
6116b8b04e Start 1.9.3 cycle 2024-09-16 11:57:41 -03:00
Eduardo Quezada
889a02d263
Version 1.9.2 (#5357) 
* Version 1.9.2

* Apply suggestions from code review

Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>

* Updated to latest master

* Updated to latest master

* Fix last PR

* Corrected order + Pumpkaboo/Gourgeist credits

---------

Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
 2024-09-16 12:12:34 -03:00
hedara90
3433567188
Gourgeist and Pumpkaboo follower sizes (#5390) 
* Gourgeist sizes

* Gourgeist all sizes

* Pumpkaboo small

* Added all sizes of Pumpkaboo

* Resized Gourgeist (no more Titan)

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-15 15:28:04 -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
Eduardo Quezada
f720916633 CI fix attempt 2024-09-15 02:25:12 -03: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
GriffinR
62c27faba4
Merge pull request #2032 from DizzyEggg/patch-1 
remove ScriptContext_Enable from secret_base.h
 2024-09-14 13:17:26 -04:00
DizzyEggg
c4b5818d98
remove ScriptContext_Enable from secret_base.h 2024-09-14 19:13:02 +02:00
pkmnsnfrn
d76ccddad3 spaces to tabs in inc files 2024-09-14 09:03:49 -07:00
pkmnsnfrn
3b226fc2e2 Removed swp 2024-09-14 09:02:15 -07:00
GriffinR
db898f8baa
Merge pull request #2030 from skyeforeverblue/patch-2 
Update pull_request_template.md to include Discord username update
 2024-09-14 10:56:50 -04:00
GriffinR
bc58a4ac04
Merge pull request #2029 from skyeforeverblue/patch-1 
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
 2024-09-14 10:56:41 -04: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
GriffinR
302193a814 Have scaninc ignore non-existing files 2024-09-14 00:28:57 -04:00